diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java index 09ab93bf..e8edc52a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java @@ -245,7 +245,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService { int boxNum = 0; // 2025.03.11 添加需求，复购专区、重消专区，指定盒数商品每用户每月限购50件 - this.checkWaresLimit(cuMember, orderParam.getSpecialArea(), waresDetailExtList, boxWaresList, gradeList); +// this.checkWaresLimit(cuMember, orderParam.getSpecialArea(), waresDetailExtList, boxWaresList, gradeList); // 遍历生成订单明细数据 for (BdWaresDetailExt waresDetailExt : waresDetailExtList) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java index 3c563929..c52233ba 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java @@ -911,9 +911,9 @@ public class SaOrderBusinessController extends BaseController { SaOrderExt saOrderExt = validateCancelOrderVO.getSaOrderExt(); saOrderExtList.add(saOrderExt); EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL; - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; - } +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; +// } Map queryChargeMap = iOrderBusinessService.queryChargeLog(saOrderExtList, approveBusiness, SecurityUtils.getPkCountry()); OrderQueryChargeDTO dto = queryChargeMap.get(saOrderExt.getPkId()); // 撤销订单，撤销产品，撤销除升级订单 @@ -932,20 +932,20 @@ public class SaOrderBusinessController extends BaseController { .orderCode(saOrderExt.getOrderCode()) .build(); List orderCancelDetailVOList = new ArrayList<>(); - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - saOrderExt.getOrderItemsList().forEach(saOrderItems -> { - String productName = productServiceApi.getProduct(saOrderItems.getPkProduct()).getData().getProductName(); - OrderCancelDetailVO orderCancelDetailVO = OrderCancelDetailVO.builder() - .pkId(saOrderItems.getPkId()) - .productName(productName) - .orderAmount(saOrderItems.getPrice()) - .number(saOrderItems.getQuantity()) - .achievement(saOrderItems.getAchievement()) - .assAchievement(saOrderItems.getAssAchievement()) - .build(); - orderCancelDetailVOList.add(orderCancelDetailVO); - }); - } else { +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// saOrderExt.getOrderItemsList().forEach(saOrderItems -> { +// String productName = productServiceApi.getProduct(saOrderItems.getPkProduct()).getData().getProductName(); +// OrderCancelDetailVO orderCancelDetailVO = OrderCancelDetailVO.builder() +// .pkId(saOrderItems.getPkId()) +// .productName(productName) +// .orderAmount(saOrderItems.getPrice()) +// .number(saOrderItems.getQuantity()) +// .achievement(saOrderItems.getAchievement()) +// .assAchievement(saOrderItems.getAssAchievement()) +// .build(); +// orderCancelDetailVOList.add(orderCancelDetailVO); +// }); +// } else { saOrderExt.getOrderItemsExtList().forEach(saOrderItems -> { OrderCancelDetailVO orderCancelDetailVO = OrderCancelDetailVO.builder() .pkId(saOrderItems.getPkId()) @@ -957,7 +957,7 @@ public class SaOrderBusinessController extends BaseController { .build(); orderCancelDetailVOList.add(orderCancelDetailVO); }); - } +// } orderCancelVO.setOrderCancelDetailVOList(orderCancelDetailVOList); orderCancelVO.setMemberCode(saOrderExt.getMemberCode()); orderCancelVO.setMemberName(saOrderExt.getMemberName()); @@ -978,11 +978,11 @@ public class SaOrderBusinessController extends BaseController { @Log(module = EOperationModule.CANCEL_ORDER_CONFIRM, method = EOperationMethod.INSERT) public AjaxResult cancelOrder(@RequestBody OrderCancelParam orderCancelParam) { orderCancelParam.setPkCountry(SecurityUtils.getPkCountry()); - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - } +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) { +// return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); +// } +// } ValidateCancelOrderVO validateCancelOrderVO = iOrderBusinessService.validateCancelOrder(orderCancelParam); AjaxResult validateCancelOrder = validateCancelOrderVO(orderCancelParam, validateCancelOrderVO); if (validateCancelOrder != null) { @@ -1001,11 +1001,11 @@ public class SaOrderBusinessController extends BaseController { @Log(module = EOperationModule.CANCEL_ORDER_CONFIRM, method = EOperationMethod.INSERT) public AjaxResult freeCostCancelOrder(@RequestBody OrderCancelParam orderCancelParam) { orderCancelParam.setPkCountry(SecurityUtils.getPkCountry()); - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); - } - } +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) { +// return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); +// } +// } if (orderCancelParam.getCancelRoad() == null || (orderCancelParam.getCancelRoad() != 1 && orderCancelParam.getCancelRoad() != 3)) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); } @@ -1014,7 +1014,7 @@ public class SaOrderBusinessController extends BaseController { if (validateCancelOrder != null) { return validateCancelOrder; } - // 2023.11.22 不走签呈也需要添加中间操作表，用于区分部分撤单和调换货物 + // 不走签呈也需要添加中间操作表，用于区分部分撤单和调换货物 iOrderBusinessService.revokeSaOrderByOrderCode(SecurityUtils.getUserId(), orderCancelParam, validateCancelOrderVO); return AjaxResult.success(); } @@ -1023,22 +1023,22 @@ public class SaOrderBusinessController extends BaseController { if (validateCancelOrderVO.getSaOrderExt() == null) { return AjaxResult.error(validateCancelOrderVO.getMsg()); } - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - SaOrderExt saOrderExt = validateCancelOrderVO.getSaOrderExt(); - if (saOrderExt.getOrderItemsList() == null) { - return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); - } - Map productMap = new HashMap<>(ComputeUtil.mapInitCapacity(orderCancelParam.getOrderCancelDetailParamList().size())); - saOrderExt.getOrderItemsList().forEach(saOrderItems -> { - String productName = productServiceApi.getProduct(saOrderItems.getPkProduct()).getData().getProductName(); - productMap.put(saOrderItems.getPkId(), productName); - }); - orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> { - if (productMap.containsKey(orderCancelDetailParam.getPkId())) { - orderCancelDetailParam.setProductName(productMap.get(orderCancelDetailParam.getPkId())); - } - }); - } +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// SaOrderExt saOrderExt = validateCancelOrderVO.getSaOrderExt(); +// if (saOrderExt.getOrderItemsList() == null) { +// return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); +// } +// Map productMap = new HashMap<>(ComputeUtil.mapInitCapacity(orderCancelParam.getOrderCancelDetailParamList().size())); +// saOrderExt.getOrderItemsList().forEach(saOrderItems -> { +// String productName = productServiceApi.getProduct(saOrderItems.getPkProduct()).getData().getProductName(); +// productMap.put(saOrderItems.getPkId(), productName); +// }); +// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> { +// if (productMap.containsKey(orderCancelDetailParam.getPkId())) { +// orderCancelDetailParam.setProductName(productMap.get(orderCancelDetailParam.getPkId())); +// } +// }); +// } return null; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java index 041cda78..c0d2fdd6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java @@ -1250,30 +1250,31 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { } int approveBusiness = EApprovalBusiness.ORDER_CANCEL.getValue(); SaOrderExt saOrderExt; - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue(); - SaOrder orderQuery = SaOrder.builder().orderStatus(EOrderStatus.PAY.getValue()).orderCode(orderCancelParam.getOrderCode()).build(); - orderQuery.setPkCountry(orderCancelParam.getPkCountry()); -// List itemIdList = new ArrayList<>(); -// if (orderCancelParam.getOrderCancelDetailParamList() != null && orderCancelParam.getOrderCancelDetailParamList().size() > 0) { -// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> -// itemIdList.add(orderCancelDetailParam.getPkId())); -// } - saOrderExt = iSaOrderService.querySaleOrderExtByOrderCode(orderQuery, new ArrayList<>()); - CuMember cuMember = iSaOrderService.getCuMemberByKey(saOrderExt.getPkMember()); - saOrderExt.setMemberCode(cuMember.getMemberCode()); - saOrderExt.setMemberName(cuMember.getMemberName()); - } else { - saOrderExt = iSaOrderService.queryOrderByCode(orderCancelParam.getOrderCode(), orderCancelParam.getPkCountry()); - } +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue(); +// SaOrder orderQuery = SaOrder.builder().orderStatus(EOrderStatus.PAY.getValue()).orderCode(orderCancelParam.getOrderCode()).build(); +// orderQuery.setPkCountry(orderCancelParam.getPkCountry()); +//// List itemIdList = new ArrayList<>(); +//// if (orderCancelParam.getOrderCancelDetailParamList() != null && orderCancelParam.getOrderCancelDetailParamList().size() > 0) { +//// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> +//// itemIdList.add(orderCancelDetailParam.getPkId())); +//// } +// saOrderExt = iSaOrderService.querySaleOrderExtByOrderCode(orderQuery, new ArrayList<>()); +// CuMember cuMember = iSaOrderService.getCuMemberByKey(saOrderExt.getPkMember()); +// saOrderExt.setMemberCode(cuMember.getMemberCode()); +// saOrderExt.setMemberName(cuMember.getMemberName()); +// } else { + saOrderExt = iSaOrderService.queryOrderByCode(orderCancelParam.getOrderCode(), orderCancelParam.getPkCountry()); +// } if (saOrderExt == null || EOrderStatus.WAIT_PAY.getValue() == saOrderExt.getOrderStatus()) { validateCancelOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); return validateCancelOrderVO; } - if (orderCancelParam.getCancelType().equals(ECancelOrderType.SINGLE_CANCEL_ORDER.getValue()) || - orderCancelParam.getCancelType().equals(ECancelOrderType.MERGE_CANCEL_ORDER.getValue()) || - orderCancelParam.getCancelType().equals(ECancelOrderType.OTHER_CANCEL_ORDER.getValue()) || - orderCancelParam.getCancelType().equals(ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue())) { + if (orderCancelParam.getCancelType().equals(ECancelOrderType.SINGLE_CANCEL_ORDER.getValue()) + || orderCancelParam.getCancelType().equals(ECancelOrderType.MERGE_CANCEL_ORDER.getValue()) + || orderCancelParam.getCancelType().equals(ECancelOrderType.OTHER_CANCEL_ORDER.getValue()) +// || orderCancelParam.getCancelType().equals(ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue()) + ) { // 验证订单时间，只能撤销7天以内的支付订单 // 周结只能撤销当前期间的订单，不能撤销上个期间的订单 String settleCycle = systemConfigServiceApi.getBonusSystemConfig(orderCancelParam.getPkCountry(), ESystemConfig.EXPAND_CAP_METHOD.getKey()).getData(); @@ -1460,14 +1461,14 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { String businessCode = CommonUtil.createSerialNumber(EOrderPrefix.DEFAULT); // 修改类型 EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL; - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; - } +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; +// } // 封装修改地址业务日志 List dtoList = new ArrayList<>(); - // 2023.11.22 不走签呈也需要添加中间操作表，用于区分部分撤单和调换货物 + // 不走签呈也需要添加中间操作表，用于区分部分撤单和调换货物 // 撤单日志列表 List saOrderChargeLogList = new ArrayList<>(); Map saOrderMap = validateCancelOrderVO.getSaOrderMap(); @@ -1549,13 +1550,13 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { orderCancelParam.setMemberCode(cuMember.getMemberCode()); orderCancelParam.setMemberName(cuMember.getMemberName()); EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL; - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; -// List orderCancelDetailParamList = new ArrayList<>(); -// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> -// orderCancelDetailParamList.add(BeanUtil.copyProperties(orderCancelDetailParam, OrderCancelDetailParam.class))); -// orderCancelParam.setOrderCancelDetailParamList(orderCancelDetailParamList); - } +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; +//// List orderCancelDetailParamList = new ArrayList<>(); +//// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> +//// orderCancelDetailParamList.add(BeanUtil.copyProperties(orderCancelDetailParam, OrderCancelDetailParam.class))); +//// orderCancelParam.setOrderCancelDetailParamList(orderCancelDetailParamList); +// } // 本次业务修改费用 Map queryChargeMap = null; if (orderCancelParam.getCancelRoad() == null || orderCancelParam.getCancelRoad() != 2) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 4200bd96..a9b2d2af 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -1258,9 +1258,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl BusinessCommissionDTO businessCommissionDTO = null; if (orderCancelParam.getCancelRoad() == 1) { EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL; - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; - } +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; +// } Map queryChargeMap = orderBusinessService.queryChargeLog(Collections.singletonList(validateCancelOrderVO.getSaOrderExt()), approveBusiness, orderCancelParam.getPkCountry()); if (queryChargeMap != null && queryChargeMap.containsKey(saOrderExt.getPkId())) { @@ -1289,47 +1289,47 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } - if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { - List orderCancelDetailParamList = orderCancelParam.getOrderCancelDetailParamList(); - List pkOrderItemList = orderCancelDetailParamList.stream().map(OrderCancelDetailParam::getPkId).collect(Collectors.toList()); - // 第二次封装订单，根据明细表计算订单主表金额、业绩 - saOrderExt.setOrderAmount(BigDecimal.ZERO); - saOrderExt.setOrderAchieve(BigDecimal.ZERO); - saOrderExt.setOrderAssAchieve(BigDecimal.ZERO); - saOrderExt.setBackOrderAmount(BigDecimal.ZERO); - List saOrderItemsList = new ArrayList<>(); - saOrderExt.getOrderItemsList().forEach(saOrderItems -> { - if (pkOrderItemList.contains(saOrderItems.getPkId())) { - saOrderExt.setBackOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getBackOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity())); - return; - } - // 总价; - saOrderExt.setOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity())); - // 总业绩 - saOrderExt.setOrderAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAchieve(), saOrderItems.getAchievement(), saOrderItems.getQuantity())); - // 总考核业绩 - saOrderExt.setOrderAssAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAssAchieve(), saOrderItems.getAssAchievement(), saOrderItems.getQuantity())); - saOrderItemsList.add(saOrderItems); - }); - saOrderExt.setUploadAchieve(saOrderExt.getOrderAchieve()); - if (saOrderItemsList.size() == 0) { - saOrderExt.setDelFlag(EDelFlag.DELETE.getValue()); - } else { - saOrderExt.setOrderItemsList(saOrderItemsList); - } - // 修改订单 - Date currentDateTime = DateUtils.currentDateTime(); - // 删除发货单 - saDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), pkOrderItemList); - updateSaOrder(pkApprove, saOrderExt, currentDateTime); - // 删除订单明细 - if (!saOrderItemsService.updateOrderItemsById(pkOrderItemList, pkApprove, currentDateTime)) { - throw new ServiceException("更新订单失败"); - } - if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, businessCommissionDTO).getData()) { - throw new ServiceException("撤单失败"); - } - } else { +// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { +// List orderCancelDetailParamList = orderCancelParam.getOrderCancelDetailParamList(); +// List pkOrderItemList = orderCancelDetailParamList.stream().map(OrderCancelDetailParam::getPkId).collect(Collectors.toList()); +// // 第二次封装订单，根据明细表计算订单主表金额、业绩 +// saOrderExt.setOrderAmount(BigDecimal.ZERO); +// saOrderExt.setOrderAchieve(BigDecimal.ZERO); +// saOrderExt.setOrderAssAchieve(BigDecimal.ZERO); +// saOrderExt.setBackOrderAmount(BigDecimal.ZERO); +// List saOrderItemsList = new ArrayList<>(); +// saOrderExt.getOrderItemsList().forEach(saOrderItems -> { +// if (pkOrderItemList.contains(saOrderItems.getPkId())) { +// saOrderExt.setBackOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getBackOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity())); +// return; +// } +// // 总价; +// saOrderExt.setOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity())); +// // 总业绩 +// saOrderExt.setOrderAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAchieve(), saOrderItems.getAchievement(), saOrderItems.getQuantity())); +// // 总考核业绩 +// saOrderExt.setOrderAssAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAssAchieve(), saOrderItems.getAssAchievement(), saOrderItems.getQuantity())); +// saOrderItemsList.add(saOrderItems); +// }); +// saOrderExt.setUploadAchieve(saOrderExt.getOrderAchieve()); +// if (saOrderItemsList.size() == 0) { +// saOrderExt.setDelFlag(EDelFlag.DELETE.getValue()); +// } else { +// saOrderExt.setOrderItemsList(saOrderItemsList); +// } +// // 修改订单 +// Date currentDateTime = DateUtils.currentDateTime(); +// // 删除发货单 +// saDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), pkOrderItemList); +// updateSaOrder(pkApprove, saOrderExt, currentDateTime); +// // 删除订单明细 +// if (!saOrderItemsService.updateOrderItemsById(pkOrderItemList, pkApprove, currentDateTime)) { +// throw new ServiceException("更新订单失败"); +// } +// if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, businessCommissionDTO).getData()) { +// throw new ServiceException("撤单失败"); +// } +// } else { // 删除订单 saOrderExt.setDelFlag(EDelFlag.DELETE.getValue()); Date currentDate = DateUtils.currentDateTime(); @@ -1367,7 +1367,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 其他撤单 this.handleCancelUpgradeOrder(saOrderExt, validateCancelOrderVO.getUpdSaOrder(), pkApprove, businessCommissionDTO); } - } +// } try { // 推送MQ的列表 @@ -2134,13 +2134,13 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } - if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType() || - EOrderType.RETAIL_CONSUME.getValue() == saOrderExt.getOrderType()) { - // 需要查询盒数商品 - List boxProductList = BoxProductUtil.getBoxProductListBySystemType(saOrderExt.getSystemType()); - // 复购、重消订单处理限购 - iSaOrderWaresLimitService.updateCancelOrder(saOrderExt.getPkId(), saOrderExt.getPkMember(), saOrderExt.getModifiedTime(), boxProductList); - } +// if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType() || +// EOrderType.RETAIL_CONSUME.getValue() == saOrderExt.getOrderType()) { +// // 需要查询盒数商品 +// List boxProductList = BoxProductUtil.getBoxProductListBySystemType(saOrderExt.getSystemType()); +// // 复购、重消订单处理限购 +// iSaOrderWaresLimitService.updateCancelOrder(saOrderExt.getPkId(), saOrderExt.getPkMember(), saOrderExt.getModifiedTime(), boxProductList); +// } if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, businessCommissionDTO).getData()) { throw new ServiceException("撤单处理会员失败"); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java index f7690572..09fb0c6a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java @@ -28,10 +28,10 @@ public enum ECancelOrderType { */ OTHER_CANCEL_ORDER(3, "其他整单撤单", 0), - /** - * 其他部分撤单 - */ - OTHER_CANCEL_PART_ORDER(4, "其他部分撤单", 0), +// /** +// * 其他部分撤单 +// */ +// OTHER_CANCEL_PART_ORDER(4, "其他部分撤单", 0), /** * 单点退单