diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java index 3b143642..4552ac5b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java @@ -172,7 +172,7 @@ public class AcConsumeRuleConfigController extends BaseController { * @param recommendParam 消费赠送参数 * @return AjaxResult */ - @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈") + @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "消费赠送") @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) { recommendParam.setPkCountry(SecurityUtils.getPkCountry()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java index b19c5675..3a36d6f9 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java @@ -111,7 +111,7 @@ public class AcMemberConsumeRuleController extends BaseController { * @param memberConsumeRuleVo 会员消费赠送参数 * @return AjaxResult */ - @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈") + @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "会员消费赠送") @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcMemberConsumeRuleVo memberConsumeRuleVo) { memberConsumeRuleVo.setLoginUser(userTokenService.getLoginUser()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java index 7dc426f1..fb28a6de 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java @@ -108,7 +108,7 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl implements IAcDrawRewardNumService { @Autowired @@ -239,10 +241,32 @@ public class AcDrawRewardNumServiceImpl extends ServiceImpl memberDto = memberServiceApi.getMember(memberCode); + Long pkMember = memberDto.getData().getPkId(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AcDrawRewardNum::getPkBaseId, pkBaseId); + queryWrapper.eq(AcDrawRewardNum::getPkMember, pkMember); + AcDrawRewardNum drawRewardNum = this.getOne(queryWrapper); + if (drawRewardNum != null) { + baseMapper.updatePurchasedTimesByBaseId(pkMember, num, pkBaseId); + } else { + drawRewardNum = new AcDrawRewardNum(); + drawRewardNum.setPkBaseId(pkBaseId); + drawRewardNum.setPkMember(pkMember); + drawRewardNum.setTotalUsedNum(num); + drawRewardNum.setAvailableNum(num); + drawRewardNum.setTotalNum(num); + drawRewardNum.setAvailableSurplusNum(num); + drawRewardNum.setCreationTime(DateUtils.currentDateTime()); + drawRewardNum.setPkCreator(memberDto.getData().getPkCreator()); + drawRewardNum.setPkCountry(memberDto.getData().getPkCountry()); + this.save(drawRewardNum); + } } /** @@ -364,10 +388,30 @@ public class AcDrawRewardNumServiceImpl extends ServiceImpl memberDto = memberServiceApi.getMember(memberCode); + Long pkMember = memberDto.getData().getPkId(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AcDrawRewardNum::getPkBaseId, pkBaseId); + queryWrapper.eq(AcDrawRewardNum::getPkMember, pkMember); + AcDrawRewardNum drawRewardNum = this.getOne(queryWrapper); + if (drawRewardNum != null) { + baseMapper.updateUnpurchasedTimesByPkbaseId(pkMember, num, pkBaseId); + } else { + drawRewardNum = new AcDrawRewardNum(); + drawRewardNum.setPkBaseId(pkBaseId); + drawRewardNum.setPkMember(pkMember); + drawRewardNum.setTotalNum(num); + drawRewardNum.setTotalSurplusNum(num); + drawRewardNum.setCreationTime(DateUtils.currentDateTime()); + drawRewardNum.setPkCreator(memberDto.getData().getPkCreator()); + drawRewardNum.setPkCountry(memberDto.getData().getPkCountry()); + this.save(drawRewardNum); + } } /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java index 6bac0df9..633f5207 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java @@ -163,7 +163,7 @@ public class WaresRuleConfigController extends BaseController { * @param recommendParam 商品赠送参数 * @return AjaxResult */ - @Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈") + @Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "商品赠送") @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) { recommendParam.setPkCountry(SecurityUtils.getPkCountry()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java index dbad8392..0f75c255 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java @@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -110,6 +111,7 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl