doum
8 小时以前 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a
Merge remote-tracking branch 'origin/master'
已修改3个文件
22 ■■■■ 文件已修改
server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
@@ -64,8 +64,13 @@
    @ApiModelProperty(value = "邀请奖励积分")
    private BigDecimal rewardIntegral;
    @ApiModelProperty(value = "完成首单奖励积分")
    private BigDecimal firstRewardIntegral;
    @ApiModelProperty(value = "邀请完成首单奖励优惠券主键 多个以,分割")
    private String couponIds;
    @ApiModelProperty(value = "邀请完成首单奖励优惠券名称 多个以,分割")
    private String couponNames;
    @ApiModelProperty(value = "被邀请人头像")
    @TableField(exist = false)
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -1726,6 +1726,8 @@
        List<JSONObject> shareCouponRewardList = platformConfigDTO.getShareCouponRewardList();
        //[{"num":"2","couponId":6},{"num":"3","couponId":5}]
        String couponIds = "";
        String couponNames = "";
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(shareCouponRewardList)){
            List<MemberCoupon> memberCouponList = new ArrayList<>();
            for (JSONObject jsonObject:shareCouponRewardList) {
@@ -1739,11 +1741,20 @@
                for (int i = 0; i < num; i++) {
                    memberCouponList.add(memberCoupon);
                }
                couponIds = couponIds + (StringUtils.isBlank(couponIds)? ",":"" )+ couponId ;
                couponNames = couponNames + (StringUtils.isBlank(couponNames)? ",":"" )+ coupon.getName() ;
            }
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberCouponList)){
                memberCouponJoinMapper.insert(memberCouponList);
            }
        }
        inviteRecordMapper.update(new UpdateWrapper<InviteRecord>().lambda()
                .set(InviteRecord::getFirstOrderStatus,Constants.ONE)
                .set(InviteRecord::getFirstFinishDate,new Date())
                .set(InviteRecord::getCouponIds,couponIds)
                .set(InviteRecord::getCouponNames,couponNames)
                .eq(InviteRecord::getId,inviteRecord.getId())
        );
    }
server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java
@@ -91,7 +91,7 @@
                if(StringUtils.isNotBlank(inviteRecord.getImgUrl())){
                    inviteRecord.setImgUrl(path + inviteRecord.getImgUrl());
                }
                num = num.add(inviteRecord.getRewardIntegral()).add(inviteRecord.getFirstRewardIntegral());
                num = num.add(inviteRecord.getRewardIntegral());
            }
            inviteInfoResponse.setNum(num.longValue());
        }