3
0
Fork 0

## 去掉复购专区限购和部分撤单处理;

This commit is contained in:
cabbage 2025-07-12 10:41:37 +08:00
parent 5de0a3ee32
commit fc5826caf1
5 changed files with 134 additions and 133 deletions

View File

@ -245,7 +245,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
int boxNum = 0; int boxNum = 0;
// 2025.03.11 添加需求复购专区重消专区指定盒数商品每用户每月限购50件 // 2025.03.11 添加需求复购专区重消专区指定盒数商品每用户每月限购50件
this.checkWaresLimit(cuMember, orderParam.getSpecialArea(), waresDetailExtList, boxWaresList, gradeList); // this.checkWaresLimit(cuMember, orderParam.getSpecialArea(), waresDetailExtList, boxWaresList, gradeList);
// 遍历生成订单明细数据 // 遍历生成订单明细数据
for (BdWaresDetailExt waresDetailExt : waresDetailExtList) { for (BdWaresDetailExt waresDetailExt : waresDetailExtList) {

View File

@ -911,9 +911,9 @@ public class SaOrderBusinessController extends BaseController {
SaOrderExt saOrderExt = validateCancelOrderVO.getSaOrderExt(); SaOrderExt saOrderExt = validateCancelOrderVO.getSaOrderExt();
saOrderExtList.add(saOrderExt); saOrderExtList.add(saOrderExt);
EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL; EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL;
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; // approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
} // }
Map<Long, OrderQueryChargeDTO> queryChargeMap = iOrderBusinessService.queryChargeLog(saOrderExtList, approveBusiness, SecurityUtils.getPkCountry()); Map<Long, OrderQueryChargeDTO> queryChargeMap = iOrderBusinessService.queryChargeLog(saOrderExtList, approveBusiness, SecurityUtils.getPkCountry());
OrderQueryChargeDTO dto = queryChargeMap.get(saOrderExt.getPkId()); OrderQueryChargeDTO dto = queryChargeMap.get(saOrderExt.getPkId());
// 撤销订单撤销产品撤销除升级订单 // 撤销订单撤销产品撤销除升级订单
@ -932,20 +932,20 @@ public class SaOrderBusinessController extends BaseController {
.orderCode(saOrderExt.getOrderCode()) .orderCode(saOrderExt.getOrderCode())
.build(); .build();
List<OrderCancelDetailVO> orderCancelDetailVOList = new ArrayList<>(); List<OrderCancelDetailVO> orderCancelDetailVOList = new ArrayList<>();
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
saOrderExt.getOrderItemsList().forEach(saOrderItems -> { // saOrderExt.getOrderItemsList().forEach(saOrderItems -> {
String productName = productServiceApi.getProduct(saOrderItems.getPkProduct()).getData().getProductName(); // String productName = productServiceApi.getProduct(saOrderItems.getPkProduct()).getData().getProductName();
OrderCancelDetailVO orderCancelDetailVO = OrderCancelDetailVO.builder() // OrderCancelDetailVO orderCancelDetailVO = OrderCancelDetailVO.builder()
.pkId(saOrderItems.getPkId()) // .pkId(saOrderItems.getPkId())
.productName(productName) // .productName(productName)
.orderAmount(saOrderItems.getPrice()) // .orderAmount(saOrderItems.getPrice())
.number(saOrderItems.getQuantity()) // .number(saOrderItems.getQuantity())
.achievement(saOrderItems.getAchievement()) // .achievement(saOrderItems.getAchievement())
.assAchievement(saOrderItems.getAssAchievement()) // .assAchievement(saOrderItems.getAssAchievement())
.build(); // .build();
orderCancelDetailVOList.add(orderCancelDetailVO); // orderCancelDetailVOList.add(orderCancelDetailVO);
}); // });
} else { // } else {
saOrderExt.getOrderItemsExtList().forEach(saOrderItems -> { saOrderExt.getOrderItemsExtList().forEach(saOrderItems -> {
OrderCancelDetailVO orderCancelDetailVO = OrderCancelDetailVO.builder() OrderCancelDetailVO orderCancelDetailVO = OrderCancelDetailVO.builder()
.pkId(saOrderItems.getPkId()) .pkId(saOrderItems.getPkId())
@ -957,7 +957,7 @@ public class SaOrderBusinessController extends BaseController {
.build(); .build();
orderCancelDetailVOList.add(orderCancelDetailVO); orderCancelDetailVOList.add(orderCancelDetailVO);
}); });
} // }
orderCancelVO.setOrderCancelDetailVOList(orderCancelDetailVOList); orderCancelVO.setOrderCancelDetailVOList(orderCancelDetailVOList);
orderCancelVO.setMemberCode(saOrderExt.getMemberCode()); orderCancelVO.setMemberCode(saOrderExt.getMemberCode());
orderCancelVO.setMemberName(saOrderExt.getMemberName()); orderCancelVO.setMemberName(saOrderExt.getMemberName());
@ -978,11 +978,11 @@ public class SaOrderBusinessController extends BaseController {
@Log(module = EOperationModule.CANCEL_ORDER_CONFIRM, method = EOperationMethod.INSERT) @Log(module = EOperationModule.CANCEL_ORDER_CONFIRM, method = EOperationMethod.INSERT)
public AjaxResult cancelOrder(@RequestBody OrderCancelParam orderCancelParam) { public AjaxResult cancelOrder(@RequestBody OrderCancelParam orderCancelParam) {
orderCancelParam.setPkCountry(SecurityUtils.getPkCountry()); orderCancelParam.setPkCountry(SecurityUtils.getPkCountry());
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) { // if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) {
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); // return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY));
} // }
} // }
ValidateCancelOrderVO validateCancelOrderVO = iOrderBusinessService.validateCancelOrder(orderCancelParam); ValidateCancelOrderVO validateCancelOrderVO = iOrderBusinessService.validateCancelOrder(orderCancelParam);
AjaxResult validateCancelOrder = validateCancelOrderVO(orderCancelParam, validateCancelOrderVO); AjaxResult validateCancelOrder = validateCancelOrderVO(orderCancelParam, validateCancelOrderVO);
if (validateCancelOrder != null) { if (validateCancelOrder != null) {
@ -1001,11 +1001,11 @@ public class SaOrderBusinessController extends BaseController {
@Log(module = EOperationModule.CANCEL_ORDER_CONFIRM, method = EOperationMethod.INSERT) @Log(module = EOperationModule.CANCEL_ORDER_CONFIRM, method = EOperationMethod.INSERT)
public AjaxResult freeCostCancelOrder(@RequestBody OrderCancelParam orderCancelParam) { public AjaxResult freeCostCancelOrder(@RequestBody OrderCancelParam orderCancelParam) {
orderCancelParam.setPkCountry(SecurityUtils.getPkCountry()); orderCancelParam.setPkCountry(SecurityUtils.getPkCountry());
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) { // if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) {
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); // return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY));
} // }
} // }
if (orderCancelParam.getCancelRoad() == null || (orderCancelParam.getCancelRoad() != 1 && orderCancelParam.getCancelRoad() != 3)) { if (orderCancelParam.getCancelRoad() == null || (orderCancelParam.getCancelRoad() != 1 && orderCancelParam.getCancelRoad() != 3)) {
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY)); return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REQUIRED_NOT_EMPTY));
} }
@ -1014,7 +1014,7 @@ public class SaOrderBusinessController extends BaseController {
if (validateCancelOrder != null) { if (validateCancelOrder != null) {
return validateCancelOrder; return validateCancelOrder;
} }
// 2023.11.22 不走签呈也需要添加中间操作表用于区分部分撤单和调换货物 // 不走签呈也需要添加中间操作表用于区分部分撤单和调换货物
iOrderBusinessService.revokeSaOrderByOrderCode(SecurityUtils.getUserId(), orderCancelParam, validateCancelOrderVO); iOrderBusinessService.revokeSaOrderByOrderCode(SecurityUtils.getUserId(), orderCancelParam, validateCancelOrderVO);
return AjaxResult.success(); return AjaxResult.success();
} }
@ -1023,22 +1023,22 @@ public class SaOrderBusinessController extends BaseController {
if (validateCancelOrderVO.getSaOrderExt() == null) { if (validateCancelOrderVO.getSaOrderExt() == null) {
return AjaxResult.error(validateCancelOrderVO.getMsg()); return AjaxResult.error(validateCancelOrderVO.getMsg());
} }
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
SaOrderExt saOrderExt = validateCancelOrderVO.getSaOrderExt(); // SaOrderExt saOrderExt = validateCancelOrderVO.getSaOrderExt();
if (saOrderExt.getOrderItemsList() == null) { // if (saOrderExt.getOrderItemsList() == null) {
return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); // return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY));
} // }
Map<Long, String> productMap = new HashMap<>(ComputeUtil.mapInitCapacity(orderCancelParam.getOrderCancelDetailParamList().size())); // Map<Long, String> productMap = new HashMap<>(ComputeUtil.mapInitCapacity(orderCancelParam.getOrderCancelDetailParamList().size()));
saOrderExt.getOrderItemsList().forEach(saOrderItems -> { // saOrderExt.getOrderItemsList().forEach(saOrderItems -> {
String productName = productServiceApi.getProduct(saOrderItems.getPkProduct()).getData().getProductName(); // String productName = productServiceApi.getProduct(saOrderItems.getPkProduct()).getData().getProductName();
productMap.put(saOrderItems.getPkId(), productName); // productMap.put(saOrderItems.getPkId(), productName);
}); // });
orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> { // orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> {
if (productMap.containsKey(orderCancelDetailParam.getPkId())) { // if (productMap.containsKey(orderCancelDetailParam.getPkId())) {
orderCancelDetailParam.setProductName(productMap.get(orderCancelDetailParam.getPkId())); // orderCancelDetailParam.setProductName(productMap.get(orderCancelDetailParam.getPkId()));
} // }
}); // });
} // }
return null; return null;
} }

View File

@ -1250,30 +1250,31 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
} }
int approveBusiness = EApprovalBusiness.ORDER_CANCEL.getValue(); int approveBusiness = EApprovalBusiness.ORDER_CANCEL.getValue();
SaOrderExt saOrderExt; SaOrderExt saOrderExt;
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue(); // approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue();
SaOrder orderQuery = SaOrder.builder().orderStatus(EOrderStatus.PAY.getValue()).orderCode(orderCancelParam.getOrderCode()).build(); // SaOrder orderQuery = SaOrder.builder().orderStatus(EOrderStatus.PAY.getValue()).orderCode(orderCancelParam.getOrderCode()).build();
orderQuery.setPkCountry(orderCancelParam.getPkCountry()); // orderQuery.setPkCountry(orderCancelParam.getPkCountry());
// List<Long> itemIdList = new ArrayList<>(); //// List<Long> itemIdList = new ArrayList<>();
// if (orderCancelParam.getOrderCancelDetailParamList() != null && orderCancelParam.getOrderCancelDetailParamList().size() > 0) { //// if (orderCancelParam.getOrderCancelDetailParamList() != null && orderCancelParam.getOrderCancelDetailParamList().size() > 0) {
// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> //// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam ->
// itemIdList.add(orderCancelDetailParam.getPkId())); //// itemIdList.add(orderCancelDetailParam.getPkId()));
// } //// }
saOrderExt = iSaOrderService.querySaleOrderExtByOrderCode(orderQuery, new ArrayList<>()); // saOrderExt = iSaOrderService.querySaleOrderExtByOrderCode(orderQuery, new ArrayList<>());
CuMember cuMember = iSaOrderService.getCuMemberByKey(saOrderExt.getPkMember()); // CuMember cuMember = iSaOrderService.getCuMemberByKey(saOrderExt.getPkMember());
saOrderExt.setMemberCode(cuMember.getMemberCode()); // saOrderExt.setMemberCode(cuMember.getMemberCode());
saOrderExt.setMemberName(cuMember.getMemberName()); // saOrderExt.setMemberName(cuMember.getMemberName());
} else { // } else {
saOrderExt = iSaOrderService.queryOrderByCode(orderCancelParam.getOrderCode(), orderCancelParam.getPkCountry()); saOrderExt = iSaOrderService.queryOrderByCode(orderCancelParam.getOrderCode(), orderCancelParam.getPkCountry());
} // }
if (saOrderExt == null || EOrderStatus.WAIT_PAY.getValue() == saOrderExt.getOrderStatus()) { if (saOrderExt == null || EOrderStatus.WAIT_PAY.getValue() == saOrderExt.getOrderStatus()) {
validateCancelOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY)); validateCancelOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY));
return validateCancelOrderVO; return validateCancelOrderVO;
} }
if (orderCancelParam.getCancelType().equals(ECancelOrderType.SINGLE_CANCEL_ORDER.getValue()) || if (orderCancelParam.getCancelType().equals(ECancelOrderType.SINGLE_CANCEL_ORDER.getValue())
orderCancelParam.getCancelType().equals(ECancelOrderType.MERGE_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_ORDER.getValue())
orderCancelParam.getCancelType().equals(ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue())) { // || orderCancelParam.getCancelType().equals(ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue())
) {
// 验证订单时间只能撤销7天以内的支付订单 // 验证订单时间只能撤销7天以内的支付订单
// 周结只能撤销当前期间的订单不能撤销上个期间的订单 // 周结只能撤销当前期间的订单不能撤销上个期间的订单
String settleCycle = systemConfigServiceApi.getBonusSystemConfig(orderCancelParam.getPkCountry(), ESystemConfig.EXPAND_CAP_METHOD.getKey()).getData(); 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); String businessCode = CommonUtil.createSerialNumber(EOrderPrefix.DEFAULT);
// 修改类型 // 修改类型
EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL; EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL;
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; // approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
} // }
// 封装修改地址业务日志 // 封装修改地址业务日志
List<BusinessLogDTO> dtoList = new ArrayList<>(); List<BusinessLogDTO> dtoList = new ArrayList<>();
// 2023.11.22 不走签呈也需要添加中间操作表用于区分部分撤单和调换货物 // 不走签呈也需要添加中间操作表用于区分部分撤单和调换货物
// 撤单日志列表 // 撤单日志列表
List<SaOrderChargeLog> saOrderChargeLogList = new ArrayList<>(); List<SaOrderChargeLog> saOrderChargeLogList = new ArrayList<>();
Map<Long, SaOrderExt> saOrderMap = validateCancelOrderVO.getSaOrderMap(); Map<Long, SaOrderExt> saOrderMap = validateCancelOrderVO.getSaOrderMap();
@ -1549,13 +1550,13 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
orderCancelParam.setMemberCode(cuMember.getMemberCode()); orderCancelParam.setMemberCode(cuMember.getMemberCode());
orderCancelParam.setMemberName(cuMember.getMemberName()); orderCancelParam.setMemberName(cuMember.getMemberName());
EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL; EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL;
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; // approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
// List<OrderCancelDetailParam> orderCancelDetailParamList = new ArrayList<>(); //// List<OrderCancelDetailParam> orderCancelDetailParamList = new ArrayList<>();
// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam -> //// orderCancelParam.getOrderCancelDetailParamList().forEach(orderCancelDetailParam ->
// orderCancelDetailParamList.add(BeanUtil.copyProperties(orderCancelDetailParam, OrderCancelDetailParam.class))); //// orderCancelDetailParamList.add(BeanUtil.copyProperties(orderCancelDetailParam, OrderCancelDetailParam.class)));
// orderCancelParam.setOrderCancelDetailParamList(orderCancelDetailParamList); //// orderCancelParam.setOrderCancelDetailParamList(orderCancelDetailParamList);
} // }
// 本次业务修改费用 // 本次业务修改费用
Map<Long, OrderQueryChargeDTO> queryChargeMap = null; Map<Long, OrderQueryChargeDTO> queryChargeMap = null;
if (orderCancelParam.getCancelRoad() == null || orderCancelParam.getCancelRoad() != 2) { if (orderCancelParam.getCancelRoad() == null || orderCancelParam.getCancelRoad() != 2) {

View File

@ -1258,9 +1258,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
BusinessCommissionDTO businessCommissionDTO = null; BusinessCommissionDTO businessCommissionDTO = null;
if (orderCancelParam.getCancelRoad() == 1) { if (orderCancelParam.getCancelRoad() == 1) {
EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL; EApprovalBusiness approveBusiness = EApprovalBusiness.ORDER_CANCEL;
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT; // approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
} // }
Map<Long, OrderQueryChargeDTO> queryChargeMap = orderBusinessService.queryChargeLog(Collections.singletonList(validateCancelOrderVO.getSaOrderExt()), Map<Long, OrderQueryChargeDTO> queryChargeMap = orderBusinessService.queryChargeLog(Collections.singletonList(validateCancelOrderVO.getSaOrderExt()),
approveBusiness, orderCancelParam.getPkCountry()); approveBusiness, orderCancelParam.getPkCountry());
if (queryChargeMap != null && queryChargeMap.containsKey(saOrderExt.getPkId())) { if (queryChargeMap != null && queryChargeMap.containsKey(saOrderExt.getPkId())) {
@ -1289,47 +1289,47 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} }
} }
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) { // if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
List<OrderCancelDetailParam> orderCancelDetailParamList = orderCancelParam.getOrderCancelDetailParamList(); // List<OrderCancelDetailParam> orderCancelDetailParamList = orderCancelParam.getOrderCancelDetailParamList();
List<Long> pkOrderItemList = orderCancelDetailParamList.stream().map(OrderCancelDetailParam::getPkId).collect(Collectors.toList()); // List<Long> pkOrderItemList = orderCancelDetailParamList.stream().map(OrderCancelDetailParam::getPkId).collect(Collectors.toList());
// 第二次封装订单根据明细表计算订单主表金额业绩 // // 第二次封装订单根据明细表计算订单主表金额业绩
saOrderExt.setOrderAmount(BigDecimal.ZERO); // saOrderExt.setOrderAmount(BigDecimal.ZERO);
saOrderExt.setOrderAchieve(BigDecimal.ZERO); // saOrderExt.setOrderAchieve(BigDecimal.ZERO);
saOrderExt.setOrderAssAchieve(BigDecimal.ZERO); // saOrderExt.setOrderAssAchieve(BigDecimal.ZERO);
saOrderExt.setBackOrderAmount(BigDecimal.ZERO); // saOrderExt.setBackOrderAmount(BigDecimal.ZERO);
List<SaOrderItems> saOrderItemsList = new ArrayList<>(); // List<SaOrderItems> saOrderItemsList = new ArrayList<>();
saOrderExt.getOrderItemsList().forEach(saOrderItems -> { // saOrderExt.getOrderItemsList().forEach(saOrderItems -> {
if (pkOrderItemList.contains(saOrderItems.getPkId())) { // if (pkOrderItemList.contains(saOrderItems.getPkId())) {
saOrderExt.setBackOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getBackOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity())); // saOrderExt.setBackOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getBackOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity()));
return; // return;
} // }
// 总价; // // 总价;
saOrderExt.setOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity())); // saOrderExt.setOrderAmount(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAmount(), saOrderItems.getPrice(), saOrderItems.getQuantity()));
// 总业绩 // // 总业绩
saOrderExt.setOrderAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAchieve(), saOrderItems.getAchievement(), saOrderItems.getQuantity())); // saOrderExt.setOrderAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAchieve(), saOrderItems.getAchievement(), saOrderItems.getQuantity()));
// 总考核业绩 // // 总考核业绩
saOrderExt.setOrderAssAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAssAchieve(), saOrderItems.getAssAchievement(), saOrderItems.getQuantity())); // saOrderExt.setOrderAssAchieve(ComputeUtil.computeAddMultiply(saOrderExt.getOrderAssAchieve(), saOrderItems.getAssAchievement(), saOrderItems.getQuantity()));
saOrderItemsList.add(saOrderItems); // saOrderItemsList.add(saOrderItems);
}); // });
saOrderExt.setUploadAchieve(saOrderExt.getOrderAchieve()); // saOrderExt.setUploadAchieve(saOrderExt.getOrderAchieve());
if (saOrderItemsList.size() == 0) { // if (saOrderItemsList.size() == 0) {
saOrderExt.setDelFlag(EDelFlag.DELETE.getValue()); // saOrderExt.setDelFlag(EDelFlag.DELETE.getValue());
} else { // } else {
saOrderExt.setOrderItemsList(saOrderItemsList); // saOrderExt.setOrderItemsList(saOrderItemsList);
} // }
// 修改订单 // // 修改订单
Date currentDateTime = DateUtils.currentDateTime(); // Date currentDateTime = DateUtils.currentDateTime();
// 删除发货单 // // 删除发货单
saDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), pkOrderItemList); // saDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), pkOrderItemList);
updateSaOrder(pkApprove, saOrderExt, currentDateTime); // updateSaOrder(pkApprove, saOrderExt, currentDateTime);
// 删除订单明细 // // 删除订单明细
if (!saOrderItemsService.updateOrderItemsById(pkOrderItemList, pkApprove, currentDateTime)) { // if (!saOrderItemsService.updateOrderItemsById(pkOrderItemList, pkApprove, currentDateTime)) {
throw new ServiceException("更新订单失败"); // throw new ServiceException("更新订单失败");
} // }
if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, businessCommissionDTO).getData()) { // if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, businessCommissionDTO).getData()) {
throw new ServiceException("撤单失败"); // throw new ServiceException("撤单失败");
} // }
} else { // } else {
// 删除订单 // 删除订单
saOrderExt.setDelFlag(EDelFlag.DELETE.getValue()); saOrderExt.setDelFlag(EDelFlag.DELETE.getValue());
Date currentDate = DateUtils.currentDateTime(); Date currentDate = DateUtils.currentDateTime();
@ -1367,7 +1367,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 其他撤单 // 其他撤单
this.handleCancelUpgradeOrder(saOrderExt, validateCancelOrderVO.getUpdSaOrder(), pkApprove, businessCommissionDTO); this.handleCancelUpgradeOrder(saOrderExt, validateCancelOrderVO.getUpdSaOrder(), pkApprove, businessCommissionDTO);
} }
} // }
try { try {
// 推送MQ的列表 // 推送MQ的列表
@ -2134,13 +2134,13 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} }
} }
if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType() || // if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType() ||
EOrderType.RETAIL_CONSUME.getValue() == saOrderExt.getOrderType()) { // EOrderType.RETAIL_CONSUME.getValue() == saOrderExt.getOrderType()) {
// 需要查询盒数商品 // // 需要查询盒数商品
List<String> boxProductList = BoxProductUtil.getBoxProductListBySystemType(saOrderExt.getSystemType()); // List<String> boxProductList = BoxProductUtil.getBoxProductListBySystemType(saOrderExt.getSystemType());
// 复购重消订单处理限购 // // 复购重消订单处理限购
iSaOrderWaresLimitService.updateCancelOrder(saOrderExt.getPkId(), saOrderExt.getPkMember(), saOrderExt.getModifiedTime(), boxProductList); // iSaOrderWaresLimitService.updateCancelOrder(saOrderExt.getPkId(), saOrderExt.getPkMember(), saOrderExt.getModifiedTime(), boxProductList);
} // }
if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, businessCommissionDTO).getData()) { if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, businessCommissionDTO).getData()) {
throw new ServiceException("撤单处理会员失败"); throw new ServiceException("撤单处理会员失败");

View File

@ -28,10 +28,10 @@ public enum ECancelOrderType {
*/ */
OTHER_CANCEL_ORDER(3, "其他整单撤单", 0), OTHER_CANCEL_ORDER(3, "其他整单撤单", 0),
/** // /**
* 其他部分撤单 // * 其他部分撤单
*/ // */
OTHER_CANCEL_PART_ORDER(4, "其他部分撤单", 0), // OTHER_CANCEL_PART_ORDER(4, "其他部分撤单", 0),
/** /**
* 单点退单 * 单点退单