From 32a9849607a10fc3c95c2159f3539b8982d39d92 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 5 Aug 2025 10:58:24 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E9=99=A4=E6=8F=90=E8=B4=A7?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E6=B3=A8=E9=87=8A=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manage/AcPickController.java | 12 +-- .../pick/param/AcPickSaveDetailParam.java | 6 +- .../activity/pick/param/AcPickSaveParam.java | 6 +- .../activity/pick/service/IAcPickService.java | 8 +- .../pick/service/impl/AcPickServiceImpl.java | 82 ------------------- .../core/web/domain/BaseApprovalEntity.java | 6 +- 6 files changed, 8 insertions(+), 112 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java index 8c65a312..15abe658 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/manage/AcPickController.java +++ b/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() diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveDetailParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveDetailParam.java index 80ecc89e..911bce37 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveDetailParam.java +++ b/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 { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveParam.java index 3602f034..5fecc023 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/param/AcPickSaveParam.java +++ b/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 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java index 77d163fc..dc7ff543 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java @@ -71,12 +71,12 @@ public interface IAcPickService extends IService { Long pkDataId, Integer quantity, Long pkModified); /* - * @description: 更新提货单 + * 更新提货单 **/ boolean updatePickUse(List acPickExtList, Integer signSource, List acPickMemberLogList); /* - * @description: 更新提货单 + * 更新提货单 **/ boolean updatePickUse(List acPickExtList, List acPickMemberLogList); @@ -108,7 +108,7 @@ public interface IAcPickService extends IService { String pickSubmit(AcPickSaveParam param, LoginUser loginUser); /** - * @description: 删除充值提货卡发起签呈 + * 删除充值提货卡发起签呈 **/ boolean delPick(AcPickSaveParam anpParam); @@ -121,7 +121,7 @@ public interface IAcPickService extends IService { String pickApprovalAgree(ApprovalBusinessResultDTO resultDTO); /** - * @description: 审核删除充值提货卡 + * 审核删除充值提货卡 **/ String delpickApprovalAgree(ApprovalBusinessResultDTO resultDTO); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java index 77ea09a8..958ea757 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java +++ b/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 impleme // 操作日志列表 List logDTOList = new ArrayList<>(); -// // 批量保存日志 -// List approvalLogList = new ArrayList<>(); - // 产品数据map Map productMap = iBdProductService.queryProductMap(param.getDetailList().stream().map(AcPickSaveDetailParam::getPkProduct).collect(Collectors.toList()), pkCountry); @@ -196,18 +193,6 @@ public class AcPickServiceImpl extends ServiceImpl impleme List 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 impleme // 推送业务操作日志 rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, logDTOList); return null; - -// if (iAcApprovalLogService.saveBatch(approvalLogList)) { -// // 保存审批日志成功，提交签呈 -// -// // 提交签呈处理 -// R 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 impleme // 删除提货列表 List updateList = new ArrayList<>(); -// // 批量保存日志 -// List 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 impleme // 推送业务操作日志 rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, logDTOList); - -// if (iAcApprovalLogService.saveBatch(approvalLogList)) { -// // 保存审批日志成功，提交签呈 -// // 提交签呈处理 -// R 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; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/BaseApprovalEntity.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/BaseApprovalEntity.java index fdcdeec7..9db44df2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/BaseApprovalEntity.java +++ b/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 {