Merge remote-tracking branch 'origin/bd_dev' into bd_dev

bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java

@@ -173,12 +173,15 @@ public class AcConsumeRuleConfigController extends BaseController {
      * @return AjaxResult
      */
     @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈")
-    @PostMapping("/online-petition")
+    @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
         recommendParam.setPkCountry(SecurityUtils.getPkCountry());
         recommendParam.setPkMember(SecurityUtils.getUserId());
         recommendParam.setLoginUser(userTokenService.getLoginUser());
-        consumeRuleConfigService.onLinePetition(recommendParam);
+        String str = consumeRuleConfigService.onLinePetition(recommendParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
         return AjaxResult.success();
     }
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java

@@ -112,10 +112,13 @@ public class AcMemberConsumeRuleController extends BaseController {
      * @return AjaxResult
      */
     @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈")
-    @PostMapping("/online-petition")
+    @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcMemberConsumeRuleVo memberConsumeRuleVo) {
         memberConsumeRuleVo.setLoginUser(userTokenService.getLoginUser());
-        iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo);
+        String str = iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
         return AjaxResult.success();
     }
 

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

@@ -38,7 +38,7 @@ public interface IAcConsumeRuleConfigService extends IService<AcConsumeRuleConfi
      * @param recommendParam
      */
 
-    Boolean onLinePetition(AcRecommendParam recommendParam);
+    String onLinePetition(AcRecommendParam recommendParam);
 
     /**
      * 消费赠送审批/修改/删除

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

@@ -28,7 +28,7 @@ public interface IAcMemberConsumeRuleService extends IService<AcMemberConsumeRul
      * @param: [memberConsumeRuleVo]
      * @return: java.lang.Boolean
      **/
-    Boolean onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo);
+    String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo);
 
     /**
      * @description: 会员消费赠审批

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

@@ -33,6 +33,7 @@ import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
 import com.hzs.system.sys.dto.LoginUser;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +48,7 @@ import java.util.List;
  * @since 2023-04-20
  */
 @Service
+@Slf4j
 public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleConfigMapper, AcConsumeRuleConfig> implements IAcConsumeRuleConfigService {
 
     @Autowired
@@ -106,7 +108,9 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
      * @param recommendParam
      */
     @Override
-    public Boolean onLinePetition(AcRecommendParam recommendParam) {
+    @Transactional
+    public String onLinePetition(AcRecommendParam recommendParam) {
+        log.info("消费赠送入参{}", recommendParam);
         EApprovalBusiness approvalBusiness = null;
         if (recommendParam.getControlType() == EControlType.SAVE.getValue()) {
             approvalBusiness = EApprovalBusiness.CONSUME_GIFT_ADD;
@@ -115,7 +119,31 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
         } else if (recommendParam.getControlType() == EControlType.DELETE.getValue()) {
             approvalBusiness = EApprovalBusiness.CONSUME_GIFT_REMOVE;
         }
-        Boolean b = submitApproval(recommendParam, approvalBusiness);
+        LoginUser loginUser = recommendParam.getLoginUser();
+        if (loginUser == null) {
+            log.error("登录用户信息为空");
+            return "登录用户信息为空";
+        }
+        if (recommendParam.getControlType().equals(EControlType.SAVE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.CONSUMPTION_GIFT.getValue());
+            iActivityService.saveConsumptionGift(activityParam);
+            return null;
+        } else if (recommendParam.getControlType().equals(EControlType.MODIFY.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.CONSUMPTION_GIFT.getValue());
+            iActivityService.updateConsumptionGift(activityParam);
+            return null;
+        } else if (recommendParam.getControlType().equals(EControlType.DELETE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            Long pkId = activityParam.getPkId();
+            this.removeActivity(pkId.intValue());
+        }
+//        Boolean b = submitApproval(recommendParam, approvalBusiness);
         ActivityParam activityParam = recommendParam.getActivityParam();
         activityParam.setPkCountry(SecurityUtils.getPkCountry());
         activityParam.setPkCreator(SecurityUtils.getUserId());
@@ -123,7 +151,7 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
 
         //日志
         iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
-        return b;
+        return null;
     }
 
     /**

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

@@ -37,6 +37,7 @@ import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
 import com.hzs.system.sys.dto.LoginUser;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,6 +57,7 @@ import java.util.List;
  * @return:
  **/
 @Service
+@Slf4j
 public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeRuleMapper, AcMemberConsumeRule> implements IAcMemberConsumeRuleService {
 
     @Autowired
@@ -80,7 +82,9 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
      * @return: java.lang.Boolean
      **/
     @Override
-    public Boolean onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
+    @Transactional
+    public String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
+        log.info("商品赠送入参{}",JSONUtil.toJsonStr(memberConsumeRuleVo));
         EApprovalBusiness approvalBusiness = null;
         if (memberConsumeRuleVo.getControlType() == EControlType.SAVE.getValue()) {
             approvalBusiness = EApprovalBusiness.MEMBER_CONSUME_GIFT_ADD;
@@ -89,14 +93,41 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
         } else if (memberConsumeRuleVo.getControlType() == EControlType.DELETE.getValue()) {
             approvalBusiness = EApprovalBusiness.MEMBER_CONSUME_GIFT_REMOVE;
         }
-        Boolean b = submitApproval(memberConsumeRuleVo, approvalBusiness);
+
+        LoginUser loginUser = memberConsumeRuleVo.getLoginUser();
+        if (loginUser == null) {
+            log.error("登录用户信息为空");
+            return "登录用户信息为空";
+        }
+        if (memberConsumeRuleVo.getControlType().equals(EControlType.SAVE.getValue())) {
+            ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.MEMBER_CONSUMPTION.getValue());
+            memberConsumeRuleVo.setActivityParam(activityParam);
+            saveMemberConsumeRule(memberConsumeRuleVo);
+            return null;
+        } else if (memberConsumeRuleVo.getControlType().equals(EControlType.MODIFY.getValue())) {
+            ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.MEMBER_CONSUMPTION.getValue());
+            memberConsumeRuleVo.setActivityParam(activityParam);
+            updateConsumptionGift(memberConsumeRuleVo);
+            return null;
+        }else if (memberConsumeRuleVo.getControlType().equals(EControlType.DELETE.getValue())) {
+            ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
+            Long pkId = activityParam.getPkId();
+            removeActivity(pkId.intValue());
+        }
+//        Boolean b = submitApproval(memberConsumeRuleVo, approvalBusiness);
         ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
         activityParam.setPkCountry(SecurityUtils.getPkCountry());
         activityParam.setPkCreator(SecurityUtils.getUserId());
         activityParam.setActType(EActType.MEMBER_CONSUMPTION.getValue());
         //日志
         iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
-        return b;
+        return null;
     }
 
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java

@@ -164,12 +164,15 @@ public class WaresRuleConfigController extends BaseController {
      * @return AjaxResult
      */
     @Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈")
-    @PostMapping("/online-petition")
+    @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
         recommendParam.setPkCountry(SecurityUtils.getPkCountry());
         recommendParam.setPkMember(SecurityUtils.getUserId());
         recommendParam.setLoginUser(userTokenService.getLoginUser());
-        waresRuleConfigService.onLinePetition(recommendParam);
+        String str = waresRuleConfigService.onLinePetition(recommendParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
         return AjaxResult.success();
     }
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/IAcWaresRuleConfigService.java

@@ -54,7 +54,7 @@ public interface IAcWaresRuleConfigService extends IService<AcWaresRuleConfig> {
      *
      * @param recommendParam
      */
-    Boolean onLinePetition(AcRecommendParam recommendParam);
+    String onLinePetition(AcRecommendParam recommendParam);
 
     /**
      * 商品赠送 审核规则

bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java

@@ -30,6 +30,7 @@ import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
 import com.hzs.system.sys.dto.LoginUser;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,6 +44,7 @@ import java.util.List;
  * @since 2023-04-20
  */
 @Service
+@Slf4j
 public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigMapper, AcWaresRuleConfig> implements IAcWaresRuleConfigService {
 
     @Autowired
@@ -108,7 +110,8 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
      * @param recommendParam
      */
     @Override
-    public Boolean onLinePetition(AcRecommendParam recommendParam) {
+    public String onLinePetition(AcRecommendParam recommendParam) {
+        log.info("商品赠送入参{}",recommendParam);
         EApprovalBusiness approvalBusiness = null;
         if (recommendParam.getControlType() == EControlType.SAVE.getValue()) {
             approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_ADD;
@@ -117,7 +120,32 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
         } else if (recommendParam.getControlType() == EControlType.DELETE.getValue()) {
             approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_REMOVE;
         }
-        Boolean b = submitApproval(recommendParam, approvalBusiness);
+//        Boolean b = submitApproval(recommendParam, approvalBusiness);
+
+        LoginUser loginUser = recommendParam.getLoginUser();
+        if (loginUser == null) {
+            log.error("登录用户信息为空");
+            return "登录用户信息为空";
+        }
+        if (recommendParam.getControlType().equals(EControlType.SAVE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
+            iActivityService.saveActivity(activityParam);
+            return null;
+        } else if (recommendParam.getControlType().equals(EControlType.MODIFY.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
+            waresRuleConfigService.updateWaresRuleConfig(activityParam);
+            return null;
+        } else if (recommendParam.getControlType().equals(EControlType.DELETE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            Long pkId = activityParam.getPkId();
+            waresRuleConfigService.removeWaresRuleConfig(pkId);
+        }
         //日志
         ActivityParam activityParam = recommendParam.getActivityParam();
         activityParam.setPkCountry(SecurityUtils.getPkCountry());
@@ -125,7 +153,7 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
         activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
         activityParam.setBusinessCode(recommendParam.getActivityParam().getBusinessCode());
         iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
-        return b;
+        return null;
     }
 
     /**