Merge branch 'bd_dev' of 47.94.45.65:angelo/java-base-app into bd_dev

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());

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());

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<AcConsumeRuleCon
      * @param recommendParam
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public String onLinePetition(AcRecommendParam recommendParam) {
         log.info("消费赠送入参{}", recommendParam);
         EApprovalBusiness approvalBusiness = null;

bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcMemberConsumeRuleServiceImpl.java

@@ -82,7 +82,7 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
      * @return: java.lang.Boolean
      **/
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
         log.info("商品赠送入参{}",JSONUtil.toJsonStr(memberConsumeRuleVo));
         EApprovalBusiness approvalBusiness = null;

bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java

@@ -118,6 +118,7 @@ public class AcDrawRewardRecordController extends BaseController {
      * 充值已购买次数按钮 (审批)
      */
     @PostMapping("/purchased-times")
+    @Log(module = EOperationModule.DRAW_PURCHASED,business = EOperationBusiness.DRAW_PURCHASED,method = EOperationMethod.INSERT,remark = "充值已购买次数")
     public AjaxResult purchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) {
         Integer pkCountry = SecurityUtils.getPkCountry();
         if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) {
@@ -145,6 +146,7 @@ public class AcDrawRewardRecordController extends BaseController {
      * 充值未购买次数 (走审批)
      */
     @PostMapping("/unpurchased-times")
+    @Log(module = EOperationModule.DRAW_UNPURCHASED,business = EOperationBusiness.DRAW_UNPURCHASED,method = EOperationMethod.INSERT,remark = "充值未购买次数")
     public AjaxResult unpurchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) {
         Integer pkCountry = SecurityUtils.getPkCountry();
         if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) {

bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java

@@ -39,6 +39,7 @@ import com.hzs.member.detail.ICuMemberServiceLogServiceApi;
 import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,6 +56,7 @@ import java.util.concurrent.TimeUnit;
  * @since 2023-04-21
  */
 @Service
+@Slf4j
 public class AcDrawRewardNumServiceImpl extends ServiceImpl<AcDrawRewardNumMapper, AcDrawRewardNum> implements IAcDrawRewardNumService {
 
     @Autowired
@@ -239,10 +241,32 @@ public class AcDrawRewardNumServiceImpl extends ServiceImpl<AcDrawRewardNumMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void purchasedTimes(PurchasedTimesParam purchasedTimesParam) {
-        purchasedTimesParam.setControlType(EControlType.MODIFY.getValue());
+        log.info("修改已购买次数入参{}",JSONUtil.toJsonStr(purchasedTimesParam));
-        //业务单号
+        String memberCode = purchasedTimesParam.getMemberCode();
-        EApprovalBusiness approvalBusiness = EApprovalBusiness.PUR_CHASED_TIMES;
+        Integer num = purchasedTimesParam.getNum();
-        submitApproval(purchasedTimesParam, approvalBusiness);
+        Long pkBaseId = purchasedTimesParam.getPkBaseId();
+        R<CuMember> memberDto = memberServiceApi.getMember(memberCode);
+        Long pkMember = memberDto.getData().getPkId();
+
+        LambdaQueryWrapper<AcDrawRewardNum> 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<AcDrawRewardNumMappe
      */
     @Override
     public void unpurchasedTimes(PurchasedTimesParam purchasedTimesParam) {
-        purchasedTimesParam.setControlType(EControlType.MODIFY.getValue());
+        log.info("修改未购买次数入参{}",JSONUtil.toJsonStr(purchasedTimesParam));
-        //业务单号
+        String memberCode = purchasedTimesParam.getMemberCode();
-        EApprovalBusiness approvalBusiness = EApprovalBusiness.UN_PUR_CHASED_TIMES;
+        Integer num = purchasedTimesParam.getNum();
-        submitApproval(purchasedTimesParam, approvalBusiness);
+        Long pkBaseId = purchasedTimesParam.getPkBaseId();
+        R<CuMember> memberDto = memberServiceApi.getMember(memberCode);
+        Long pkMember = memberDto.getData().getPkId();
+
+        LambdaQueryWrapper<AcDrawRewardNum> 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);
+        }
     }
 
     /**

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());

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<AcWaresRuleConfigM
      * @param recommendParam
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String onLinePetition(AcRecommendParam recommendParam) {
         log.info("商品赠送入参{}",recommendParam);
         EApprovalBusiness approvalBusiness = null;

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java

@@ -248,6 +248,10 @@ public enum EOperationBusiness {
 
     DRAW_DETAIL("抽奖明细"),
 
+    DRAW_PURCHASED("充值已购买次数"),
+
+    DRAW_UNPURCHASED("充值未购买次数"),
+
     AC_RECOMMEEND_CONFIG("直推赠送"),
 
     AC_WARES_RULE_CONFIG("商品赠送"),

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java

@@ -164,6 +164,10 @@ public enum EOperationModule {
 
     DRAW_DETAIL("抽奖明细"),
 
+    DRAW_PURCHASED("充值已购买次数"),
+
+    DRAW_UNPURCHASED("充值未购买次数"),
+
     RECOMMEND_GIVE("直推赠送"),
     BENEFITS_GIVE("权益赠送"),
     BENEFITS_GIVE_LOG("权益赠送记录"),