9 changed files with 18 additions and 114 deletions
--- 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
@ -173,15 +173,12 @@ public class AcConsumeRuleConfigController extends BaseController {
     * @return AjaxResult
     */
    @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈")
-    @PostMapping("/submit")
+    @PostMapping("/online-petition")
    public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
        recommendParam.setPkCountry(SecurityUtils.getPkCountry());
        recommendParam.setPkMember(SecurityUtils.getUserId());
        recommendParam.setLoginUser(userTokenService.getLoginUser());
-        String str = consumeRuleConfigService.onLinePetition(recommendParam);
-        if (str != null) {
-            return AjaxResult.error(str);
-        }
+        consumeRuleConfigService.onLinePetition(recommendParam);
        return AjaxResult.success();
    }

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

--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java
+++ b/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
     */

-    String onLinePetition(AcRecommendParam recommendParam);
+    Boolean onLinePetition(AcRecommendParam recommendParam);

    /**
     * 消费赠送审批/修改/删除
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcMemberConsumeRuleService.java
+++ b/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
     **/
-    String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo);
+    Boolean onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo);

    /**
     * @description: 会员消费赠审批
--- 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
@ -33,7 +33,6 @@ 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;
@ -48,7 +47,6 @@ import java.util.List;
 * @since 2023-04-20
 */
@Service
-@Slf4j
 public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleConfigMapper, AcConsumeRuleConfig> implements IAcConsumeRuleConfigService {

    @Autowired
@ -108,9 +106,7 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
     * @param recommendParam
     */
    @Override
-    @Transactional
-    public String onLinePetition(AcRecommendParam recommendParam) {
-        log.info("消费赠送入参{}", recommendParam);
+    public Boolean onLinePetition(AcRecommendParam recommendParam) {
        EApprovalBusiness approvalBusiness = null;
        if (recommendParam.getControlType() == EControlType.SAVE.getValue()) {
            approvalBusiness = EApprovalBusiness.CONSUME_GIFT_ADD;
@ -119,31 +115,7 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
        } else if (recommendParam.getControlType() == EControlType.DELETE.getValue()) {
            approvalBusiness = EApprovalBusiness.CONSUME_GIFT_REMOVE;
        }
-        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);
+        Boolean b = submitApproval(recommendParam, approvalBusiness);
        ActivityParam activityParam = recommendParam.getActivityParam();
        activityParam.setPkCountry(SecurityUtils.getPkCountry());
        activityParam.setPkCreator(SecurityUtils.getUserId());
@ -151,7 +123,7 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon

        //日志
        iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
-        return null;
+        return b;
    }

    /**
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcMemberConsumeRuleServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcMemberConsumeRuleServiceImpl.java
@ -37,7 +37,6 @@ 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;
@ -57,7 +56,6 @@ import java.util.List;
 * @return:
 **/
@Service
-@Slf4j
 public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeRuleMapper, AcMemberConsumeRule> implements IAcMemberConsumeRuleService {

    @Autowired
@ -82,9 +80,7 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
     * @return: java.lang.Boolean
     **/
    @Override
-    @Transactional
-    public String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
-        log.info("商品赠送入参{}",JSONUtil.toJsonStr(memberConsumeRuleVo));
+    public Boolean onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
        EApprovalBusiness approvalBusiness = null;
        if (memberConsumeRuleVo.getControlType() == EControlType.SAVE.getValue()) {
            approvalBusiness = EApprovalBusiness.MEMBER_CONSUME_GIFT_ADD;
@ -93,41 +89,14 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
        } else if (memberConsumeRuleVo.getControlType() == EControlType.DELETE.getValue()) {
            approvalBusiness = EApprovalBusiness.MEMBER_CONSUME_GIFT_REMOVE;
        }
-
-        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);
+        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 null;
+        return b;
    }

    /**
--- 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
@ -164,15 +164,12 @@ 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("/submit")
+    @PostMapping("/online-petition")
    public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
        recommendParam.setPkCountry(SecurityUtils.getPkCountry());
        recommendParam.setPkMember(SecurityUtils.getUserId());
        recommendParam.setLoginUser(userTokenService.getLoginUser());
-        String str = waresRuleConfigService.onLinePetition(recommendParam);
-        if (str != null) {
-            return AjaxResult.error(str);
-        }
+        waresRuleConfigService.onLinePetition(recommendParam);
        return AjaxResult.success();
    }

--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/IAcWaresRuleConfigService.java
+++ b/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
     */
-    String onLinePetition(AcRecommendParam recommendParam);
+    Boolean onLinePetition(AcRecommendParam recommendParam);

    /**
     * 商品赠送 审核规则
--- 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
@ -30,7 +30,6 @@ 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;
@ -44,7 +43,6 @@ import java.util.List;
 * @since 2023-04-20
 */
@Service
-@Slf4j
 public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigMapper, AcWaresRuleConfig> implements IAcWaresRuleConfigService {

    @Autowired
@ -110,8 +108,7 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
     * @param recommendParam
     */
    @Override
-    public String onLinePetition(AcRecommendParam recommendParam) {
-        log.info("商品赠送入参{}",recommendParam);
+    public Boolean onLinePetition(AcRecommendParam recommendParam) {
        EApprovalBusiness approvalBusiness = null;
        if (recommendParam.getControlType() == EControlType.SAVE.getValue()) {
            approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_ADD;
@ -120,32 +117,7 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
        } else if (recommendParam.getControlType() == EControlType.DELETE.getValue()) {
            approvalBusiness = EApprovalBusiness.PRODUCT_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.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);
-        }
+        Boolean b = submitApproval(recommendParam, approvalBusiness);
        //日志
        ActivityParam activityParam = recommendParam.getActivityParam();
        activityParam.setPkCountry(SecurityUtils.getPkCountry());
@ -153,7 +125,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 null;
+        return b;
    }

    /**