wuxw
2024-06-16 36f11d01cd7499b00f8c962f08023d75502b9468
支付支持积分功能
5个文件已修改
81 ■■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/integral/DeductionIntegralDto.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-interface/src/main/java/com/java110/intf/job/IMallInnerServiceSMO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/integral/impl/ComputeDeductionIntegralImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/integral/impl/DeductionIntegralImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-job/src/main/java/com/java110/job/smo/impl/MallInnerServiceSMOImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/integral/DeductionIntegralDto.java
@@ -8,6 +8,12 @@
    private double money;
    private String link;
    private String communityId;
    private String remark;
    public DeductionIntegralDto(int integral, double money) {
        this.integral = integral;
        this.money = money;
@@ -28,4 +34,28 @@
    public void setMoney(double money) {
        this.money = money;
    }
    public String getLink() {
        return link;
    }
    public void setLink(String link) {
        this.link = link;
    }
    public String getCommunityId() {
        return communityId;
    }
    public void setCommunityId(String communityId) {
        this.communityId = communityId;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}
java110-interface/src/main/java/com/java110/intf/job/IMallInnerServiceSMO.java
@@ -4,6 +4,7 @@
import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.IotDataDto;
import com.java110.dto.MallDataDto;
import com.java110.dto.integral.DeductionIntegralDto;
import com.java110.dto.integral.GiftIntegralDto;
import com.java110.dto.user.UserDto;
import com.java110.vo.ResultVo;
@@ -56,4 +57,7 @@
    @RequestMapping(value = "/sendUserIntegral", method = RequestMethod.POST)
    ResultVo sendUserIntegral(@RequestBody GiftIntegralDto giftIntegralDto);
    @RequestMapping(value = "/userIntegralToCommunity", method = RequestMethod.POST)
    ResultVo userIntegralToCommunity(@RequestBody DeductionIntegralDto deductionIntegralDto);
}
service-acct/src/main/java/com/java110/acct/integral/impl/ComputeDeductionIntegralImpl.java
@@ -29,7 +29,7 @@
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
    @Override
    public DeductionIntegralDto deduction(String userId,String orderId, String communityId) {
    public DeductionIntegralDto deduction(String userId, String orderId, String communityId) {
        String mallSwitch = MappingCache.getValue(MALL_DOMAIN, "MALL_SWITCH");
@@ -58,7 +58,9 @@
        JSONObject data = reqJson.getJSONObject("data");
       DeductionIntegralDto deductionIntegralDto =  new DeductionIntegralDto(data.getIntValue("integral"), data.getDoubleValue("integralMoney"));
        DeductionIntegralDto deductionIntegralDto = new DeductionIntegralDto(data.getIntValue("integral"), data.getDoubleValue("integralMoney"));
        deductionIntegralDto.setLink(userDtos.get(0).getTel());
        deductionIntegralDto.setCommunityId(communityId);
        CommonCache.setValue("integral_deduction_" + orderId, JSONObject.toJSONString(deductionIntegralDto), CommonCache.PAY_DEFAULT_EXPIRE_TIME);
        return deductionIntegralDto;
    }
service-acct/src/main/java/com/java110/acct/integral/impl/DeductionIntegralImpl.java
@@ -3,12 +3,20 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.acct.integral.IDeductionIntegral;
import com.java110.dto.integral.DeductionIntegralDto;
import com.java110.intf.job.IMallInnerServiceSMO;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class DeductionIntegralImpl implements IDeductionIntegral {
    @Autowired
    private IMallInnerServiceSMO mallInnerServiceSMOImpl;
    @Override
    public int deduction(String orderId) {
@@ -22,6 +30,14 @@
        if (deductionIntegralDto == null) {
            return 0;
        }
        return 0;
        ResultVo resultVo = mallInnerServiceSMOImpl.userIntegralToCommunity(deductionIntegralDto);
        if(resultVo.getCode() != ResultVo.CODE_OK){
            throw new IllegalArgumentException(resultVo.getMsg());
        }
        return 1;
    }
}
service-job/src/main/java/com/java110/job/smo/impl/MallInnerServiceSMOImpl.java
@@ -5,6 +5,7 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.MallDataDto;
import com.java110.dto.integral.DeductionIntegralDto;
import com.java110.dto.integral.GiftIntegralDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.job.IMallInnerServiceSMO;
@@ -153,4 +154,26 @@
        return resultVo;
    }
    @Override
    public ResultVo userIntegralToCommunity(@RequestBody DeductionIntegralDto deductionIntegralDto) {
        String mallSwitch = MappingCache.getValue(MALL_DOMAIN, "MALL_SWITCH");
        if (!"ON".equals(mallSwitch)) {
            return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
        }
        JSONObject paramIn = new JSONObject();
        paramIn.put("link", deductionIntegralDto.getLink());
        paramIn.put("integral", deductionIntegralDto.getIntegral());
        paramIn.put("communityId", deductionIntegralDto.getCommunityId());
        paramIn.put("remark", deductionIntegralDto.getRemark());
        paramIn.put("mallApiCode", "userIntegralToCommunity");
        ResultVo resultVo = sendMallImpl.post("/mall/api/common.openCommonApi", paramIn);
        return resultVo;
    }
}