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

bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java

@@ -38,11 +38,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * @Description: 提货处理控制器
+ * 提货处理控制器
- * @Author: jiang chao
- * @Time: 2023/4/21 17:59
- * @Classname: AcPickController
- * @PackageName: com.hzs.activity.pick.controller.manage
  */
 @RequestMapping("/manage/pick")
 @RestController
@@ -238,12 +234,6 @@ public class AcPickController extends BaseController {
     @Log(module = EOperationModule.RECHARGE_PICK, business = EOperationBusiness.RECHARGE_PICK, method = EOperationMethod.SUBMIT)
     @PostMapping("/submit")
     public AjaxResult submit(@RequestBody AcPickSaveParam param) {
-//        if (null == param.getSignType() || CollectionUtil.isEmpty(param.getUserIdList())
-//                || CollectionUtil.isEmpty(param.getDetailList())) {
-//            // 缺少参数
-//            return AjaxResult.error("缺少参数");
-//        }
-
         for (AcPickSaveDetailParam detailParam : param.getDetailList()) {
             if (StringUtils.isAnyEmpty(detailParam.getMemberCode(), detailParam.getSpecsName(), detailParam.getSpecsNameId())
                     || null == detailParam.getPkProduct() || null == detailParam.getBaseQuantity() || null == detailParam.getQuantity()

bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveDetailParam.java

@@ -6,11 +6,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: 提货明细保存入参
+ * 提货明细保存入参
- * @Author: jiang chao
- * @Time: 2023/5/10 19:06
- * @Classname: AcPickSaveDetailParam
- * @PackageName: com.hzs.activity.pick.param
  */
 @Data
 public class AcPickSaveDetailParam implements Serializable {

bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveParam.java

@@ -8,11 +8,7 @@ import lombok.EqualsAndHashCode;
 import java.util.List;
 
 /**
- * @Description: 提货保存入参
+ * 提货保存入参
- * @Author: jiang chao
- * @Time: 2023/4/22 11:26
- * @Classname: AcPickSaveParam
- * @PackageName: com.hzs.activity.pick.param
  */
 @EqualsAndHashCode(callSuper = true)
 @Data

bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java

@@ -71,12 +71,12 @@ public interface IAcPickService extends IService<AcPick> {
                                                 Long pkDataId, Integer quantity, Long pkModified);
 
     /*
-     * @description: 更新提货单
+     *  更新提货单
      **/
     boolean updatePickUse(List<AcPickExt> acPickExtList, Integer signSource, List<AcPickMemberLog> acPickMemberLogList);
 
     /*
-     * @description: 更新提货单
+     *  更新提货单
      **/
     boolean updatePickUse(List<AcPickExt> acPickExtList, List<AcPickMemberLog> acPickMemberLogList);
 
@@ -108,7 +108,7 @@ public interface IAcPickService extends IService<AcPick> {
     String pickSubmit(AcPickSaveParam param, LoginUser loginUser);
 
     /**
-     * @description: 删除充值提货卡发起签呈
+     * 删除充值提货卡发起签呈
      **/
     boolean delPick(AcPickSaveParam anpParam);
 
@@ -121,7 +121,7 @@ public interface IAcPickService extends IService<AcPick> {
     String pickApprovalAgree(ApprovalBusinessResultDTO resultDTO);
 
     /**
-     * @description: 审核删除充值提货卡
+     * 审核删除充值提货卡
      **/
     String delpickApprovalAgree(ApprovalBusinessResultDTO resultDTO);
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java

@@ -184,9 +184,6 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
         // 操作日志列表
         List<BusinessLogDTO> logDTOList = new ArrayList<>();
 
-//        // 批量保存日志
-//        List<AcApprovalLog> approvalLogList = new ArrayList<>();
-
         // 产品数据map
         Map<Integer, BdProduct> productMap = iBdProductService.queryProductMap(param.getDetailList().stream().map(AcPickSaveDetailParam::getPkProduct).collect(Collectors.toList()), pkCountry);
 
@@ -196,18 +193,6 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
         List<AcPick> updateList = new ArrayList<>();
 
         for (AcPickSaveDetailParam detailParam : param.getDetailList()) {
-//            // 活动审批日志
-//            AcApprovalLog acApprovalLog = new AcApprovalLog();
-//            acApprovalLog.setApprovalType(EApprovalBusiness.PICK_ADD.getValue());
-//            acApprovalLog.setBusinessCode(businessCode);
-//            acApprovalLog.setPkCreator(userId);
-//            acApprovalLog.setPkCountry(pkCountry);
-//            acApprovalLog.setAfterData(JSONUtil.toJsonStr(detailParam));
-//            if (null != detailParam.getPkId()) {
-//                acApprovalLog.setPkBusiness(detailParam.getPkId());
-//            }
-//            approvalLogList.add(acApprovalLog);
-
             // 会员信息
             CuMember cuMember = iMemberServiceApi.queryMember(detailParam.getMemberCode()).getData();
             // 提货ID
@@ -323,33 +308,6 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
         // 推送业务操作日志
         rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, logDTOList);
         return null;
-
-//        if (iAcApprovalLogService.saveBatch(approvalLogList)) {
-//            // 保存审批日志成功，提交签呈
-//
-//            // 提交签呈处理
-//            R<String> resultR = iApprovalServiceApi.submitOrder(
-//                    ApprovalSubmitDTO.builder()
-//                            .eApprovalBusiness(EApprovalBusiness.PICK_ADD)
-//                            .businessCode(businessCode)
-//                            .signType(ESignType.getEnumByValue(param.getSignType()))
-//                            .userIdList(param.getUserIdList())
-//                            .sendIdList(param.getSendIdList())
-//                            .remark(param.getRemark())
-//                            .fileList(param.getFileList())
-//                            .build(),
-//                    loginUser,
-//                    null
-//            );
-//            if (resultR.isSuccess()) {
-//                // 推送业务操作日志
-//                rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, logDTOList);
-//
-//                return null;
-//            }
-//            throw new BaseException(TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + ": " + resultR.getMsg());
-//        }
-//        return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED);
     }
 
     @Override
@@ -367,22 +325,7 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
         // 删除提货列表
         List<AcPick> updateList = new ArrayList<>();
 
-//        // 批量保存日志
-//        List<AcApprovalLog> approvalLogList = new ArrayList<>();
-
         for (AcPickSaveDetailParam detailParam : param.getDetailList()) {
-//            // 活动审批日志
-//            AcApprovalLog acApprovalLog = new AcApprovalLog();
-//            acApprovalLog.setApprovalType(EApprovalBusiness.PICK_ADD_DEL.getValue());
-//            acApprovalLog.setBusinessCode(businessCode);
-//            acApprovalLog.setPkCreator(userId);
-//            acApprovalLog.setPkCountry(pkCountry);
-//            acApprovalLog.setAfterData(JSONUtil.toJsonStr(detailParam));
-//            if (null != detailParam.getPkId()) {
-//                acApprovalLog.setPkBusiness(detailParam.getPkId());
-//            }
-//            approvalLogList.add(acApprovalLog);
-
             // 被操作会员
             CuMember cuMember = iMemberServiceApi.queryMember(detailParam.getMemberCode()).getData();
             // 提货ID
@@ -468,31 +411,6 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
 
         // 推送业务操作日志
         rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, logDTOList);
-
-//        if (iAcApprovalLogService.saveBatch(approvalLogList)) {
-//            // 保存审批日志成功，提交签呈
-//            // 提交签呈处理
-//            R<String> resultR = iApprovalServiceApi.submitOrder(
-//                    ApprovalSubmitDTO.builder()
-//                            .eApprovalBusiness(EApprovalBusiness.PICK_ADD_DEL)
-//                            .businessCode(businessCode)
-//                            .signType(ESignType.getEnumByValue(param.getSignType()))
-//                            .userIdList(param.getUserIdList())
-//                            .sendIdList(param.getSendIdList())
-//                            .remark(param.getRemark())
-//                            .fileList(param.getFileList())
-//                            .build(),
-//                    param.getLoginUser(),
-//                    null
-//            );
-//            if (resultR.isSuccess()) {
-//                // 推送业务操作日志
-//                rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, logDTOList);
-//
-//                return true;
-//            }
-//            throw new BaseException(TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + ": " + resultR.getMsg());
-//        }
         return true;
     }
 

bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/BaseApprovalEntity.java

@@ -6,11 +6,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @Description: 审批基类
+ * 审批基类
- * @Author: jiang chao
- * @Time: 2023/3/16 14:28
- * @Classname: BaseApprovalEntity
- * @PackageName: com.hzs.common.core.web.domain
  */
 @Data
 public class BaseApprovalEntity implements Serializable {