angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 注册转复购撤单相关处理；

This commit is contained in:
cabbage 2025-07-16 12:04:15 +08:00
parent a65ac84227
commit aab42daf4c
28 changed files with 387 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bd-api/bd-api-sale/src/main/java/com/hzs/sale/product/IProductServiceApi.java
View File

@ -3,16 +3,12 @@ package com.hzs.sale.product;
import com.hzs.common.core.domain.R;
import com.hzs.common.domain.sale.classify.BdSpecs;
import com.hzs.common.domain.sale.ext.BdProductExt;
import com.hzs.common.domain.sale.product.BdProduct;
import com.hzs.common.domain.sale.product.BdProductSpecs;
import com.hzs.sale.product.dto.ProductDTO;
import com.hzs.sale.product.dto.ProductParamDTO;
import com.hzs.system.sys.dto.LoginUser;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
public interface IProductServiceApi {
@ -24,11 +20,6 @@ public interface IProductServiceApi {
*/
R<ProductDTO> getProduct(Integer productId);
/*
* @description: 根据规格、主键查询产品
**/
R<List<BdProductExt>> queryProductDtoById(List<BdProductSpecs> productSpecsList, Integer pkCountry);
/**
* 根据产品编号查询产品
*
@ -37,17 +28,4 @@ public interface IProductServiceApi {
*/
R<ProductDTO> getProduct(String productCode);
/*
* @description: 根据主键List查询规格
**/
R<List<BdSpecs>> queryBdSpecsByIdList(List<Integer> idList);
/**
* 产品新增
*
* @param productParamDTO
* @return 编号
*/
R<String> saveProduct(ProductParamDTO productParamDTO, LoginUser loginUser);
}

12
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
View File

@ -303,8 +303,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
}
/**
* 保存会员账户信息
*
* @param cuMember 会员
* @Description: 保存会员账户信息
*/
private void saveMemberAccount(CuMember cuMember) {
// 新会员生成账户，保存账户
@ -632,9 +633,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
@Transactional(rollbackFor = Exception.class)
public Boolean singleRevokeMemberByRegisterOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) {
deductCancelOrderCost(businessCommissionDTO);
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() ||
EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) {
// 会员账号 验证会员账户是否存在金额
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType()
|| EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()
|| (EOrderType.REPURCHASE_ORDER.getValue() == saOrder.getOrderType() && EOrderTypeExtend.REG_REP.getValue() == saOrder.getOrderTypeExtend())
) {
// 注册类订单 或 注册转复购 订单
// 会员账号 验证会员账户是否存在金额
CuMember member = iCuMemberService.getMemberById(saOrder.getPkMember());
// 会员变为死点
member.setCategory(ECategory.LOGGED_OUT.getValue());

5
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverItemsMapper.java
View File

@ -59,9 +59,4 @@ public interface SaDeliverItemsMapper extends BaseMapper<SaDeliverItems> {
@Param("orderStatusList") List<Integer> orderStatusList,
@Param("pkCountry") Integer pkCountry);
/*
* 查询订单是否绑定追溯码
**/
List<SaDeliverItems> querySaDeliverItemByOrder(@Param("orderCode") String orderCode, @Param("itemIdList") List<Long> itemIdList);
}

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverItemsService.java
View File

@ -3,7 +3,6 @@ package com.hzs.sale.deliver.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.sale.deliver.SaDeliverItems;
import com.hzs.sale.deliver.vo.DeliverBarCodeVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -45,11 +44,6 @@ public interface ISaDeliverItemsService extends IService<SaDeliverItems> {
List<Integer> orderStatusList,
Integer pkCountry);
/**
* 查询订单是否绑定追溯码
*/
Boolean validateOrderBindBarCode(String orderCode, List<Long> itemIdList);
/**
* 删除发货单
*/

10
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverItemsServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.hzs.sale.deliver.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.enums.EYesNo;
@ -37,15 +36,6 @@ public class SaDeliverItemsServiceImpl extends ServiceImpl<SaDeliverItemsMapper,
return baseMapper.queryDeliverItemsByOrder(pkOrder, pkOrderItemList, orderStatusList, pkCountry);
}
@Override
public Boolean validateOrderBindBarCode(String orderCode, List<Long> itemIdList) {
List<SaDeliverItems> saDeliverItems = baseMapper.querySaDeliverItemByOrder(orderCode, itemIdList);
if (CollectionUtil.isNotEmpty(saDeliverItems)) {
return Boolean.TRUE;
}
return Boolean.FALSE;
}
@Override
public void deleteSaDeliverItems(Long pkOrder, List<Long> pkOrderItemsList) {
LambdaUpdateWrapper<SaDeliverItems> updateWrapper = new LambdaUpdateWrapper<>();

23
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java
View File

@ -61,8 +61,6 @@ public class ApiOrderController extends BaseController {
private ISaDeliverService iSaDeliverService;
@Autowired
private IOrderBusinessService iOrderBusinessService;
@Autowired
private ISaDeliverItemsService saDeliverItemsService;
@DubboReference
ICurrencyServiceApi iCurrencyServiceApi;
@ -236,6 +234,7 @@ public class ApiOrderController extends BaseController {
tableDataInfo.setRows(list);
return tableDataInfo;
}
/**
* 订单详情
*
@ -759,15 +758,6 @@ public class ApiOrderController extends BaseController {
if (StringUtils.isEmpty(myOrderVO.getOrderCode())) {
return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_CODE_EMPTY));
}
List<Long> itemIdList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(myOrderVO.getItemList())) {
myOrderVO.getItemList().forEach(itm -> {
itemIdList.add(itm.getPkId());
});
}
if (saDeliverItemsService.validateOrderBindBarCode(myOrderVO.getOrderCode(), itemIdList)) {
return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_BIND_BAR_CODE));
}
return AjaxResult.success();
}
@ -777,14 +767,19 @@ public class ApiOrderController extends BaseController {
@PostMapping("/self-revoke-order")
public AjaxResult selfRevokeOrder(@RequestBody MyOrderVO myOrderVO, HttpServletRequest request) {
Long userId = SecurityUtils.getUserId();
// 校验撤单
myOrderVO = iOrderBusinessService.checkSelfOrder(userId, myOrderVO);
if (StringUtils.isNotEmpty(myOrderVO.getMsg())) {
return AjaxResult.error(myOrderVO.getMsg());
}
iSaOrderService.selfRevokeOrder(userId, myOrderVO);
//注册订单强制退出登录
if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue() ||
myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()) {
SaOrderExt saOrderExt = myOrderVO.getSaOrderExt();
if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue()
|| myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()
|| (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType() && EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend())
) {
// 注册类订单或 注册转复购 订单 强制退出
if (userId.equals(myOrderVO.getPkMember())) {
String token = SecurityUtils.getToken(request);
if (StringUtils.isNotEmpty(token)) {

97
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderBusinessController.java
View File

@ -10,7 +10,6 @@ import com.hzs.common.core.constant.msg.CommonMsgConstants;
import com.hzs.common.core.constant.msg.MemberMsgConstants;
import com.hzs.common.core.constant.msg.SaOrderMsgConstants;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.ComputeUtil;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.utils.poi.ExcelUtil;
@ -79,8 +78,6 @@ public class SaOrderBusinessController extends BaseController {
private IOrderBusinessService iOrderBusinessService;
@Autowired
private ISaOrderSelfLogService iSaOrderSelfLogService;
@Autowired
private ISaDeliverItemsService saDeliverItemsService;
@Autowired
private UserTokenService userTokenService;
@ -90,8 +87,6 @@ public class SaOrderBusinessController extends BaseController {
@DubboReference
IBusinessCommission iBusinessCommission;
@DubboReference
IProductServiceApi iProductServiceApi;
@DubboReference
IUserServiceApi iUserServiceApi;
@DubboReference
IMemberServiceApi iMemberServiceApi;
@ -864,9 +859,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<Long, OrderQueryChargeDTO> queryChargeMap = iOrderBusinessService.queryChargeLog(saOrderExtList, approveBusiness, SecurityUtils.getPkCountry());
OrderQueryChargeDTO dto = queryChargeMap.get(saOrderExt.getPkId());
// 撤销订单，撤销产品，撤销除升级订单
@ -885,20 +880,20 @@ public class SaOrderBusinessController extends BaseController {
.orderCode(saOrderExt.getOrderCode())
.build();
List<OrderCancelDetailVO> orderCancelDetailVOList = new ArrayList<>();
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
saOrderExt.getOrderItemsList().forEach(saOrderItems -> {
String productName = iProductServiceApi.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 = iProductServiceApi.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())
@ -910,7 +905,7 @@ public class SaOrderBusinessController extends BaseController {
.build();
orderCancelDetailVOList.add(orderCancelDetailVO);
});
}
// }
orderCancelVO.setOrderCancelDetailVOList(orderCancelDetailVOList);
orderCancelVO.setMemberCode(saOrderExt.getMemberCode());
orderCancelVO.setMemberName(saOrderExt.getMemberName());
@ -931,11 +926,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(MemberMsgConstants.REQUIRED_NOT_EMPTY);
}
}
// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
// if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) {
// return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY);
// }
// }
ValidateCancelOrderVO validateCancelOrderVO = iOrderBusinessService.validateCancelOrder(orderCancelParam);
AjaxResult validateCancelOrder = validateCancelOrder(orderCancelParam, validateCancelOrderVO);
if (validateCancelOrder != null) {
@ -954,11 +949,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(MemberMsgConstants.REQUIRED_NOT_EMPTY);
}
}
// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
// if (orderCancelParam.getOrderCancelDetailParamList() == null || orderCancelParam.getOrderCancelDetailParamList().size() == 0) {
// return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY);
// }
// }
if (orderCancelParam.getCancelRoad() == null || (orderCancelParam.getCancelRoad() != 1 && orderCancelParam.getCancelRoad() != 3)) {
return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY);
}
@ -976,22 +971,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(SaOrderMsgConstants.ORDER_EMPTY);
}
Map<Long, String> productMap = new HashMap<>(ComputeUtil.mapInitCapacity(orderCancelParam.getOrderCancelDetailParamList().size()));
saOrderExt.getOrderItemsList().forEach(saOrderItems -> {
String productName = iProductServiceApi.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(SaOrderMsgConstants.ORDER_EMPTY);
// }
// Map<Long, String> productMap = new HashMap<>(ComputeUtil.mapInitCapacity(orderCancelParam.getOrderCancelDetailParamList().size()));
// saOrderExt.getOrderItemsList().forEach(saOrderItems -> {
// String productName = iProductServiceApi.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;
}
@ -1130,14 +1125,10 @@ public class SaOrderBusinessController extends BaseController {
*/
@PostMapping("/validate-bind")
public AjaxResult validateOrderBindBarCode(@RequestBody OrderQueryParam orderQueryParam) {
log.info(orderQueryParam.getOrderCode());
// 验证订单编号、订单类型是否存在
if (StringUtils.isEmpty(orderQueryParam.getOrderCode())) {
return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_CODE_EMPTY));
}
if (saDeliverItemsService.validateOrderBindBarCode(orderQueryParam.getOrderCode(), orderQueryParam.getItemIdList())) {
return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_BIND_BAR_CODE));
}
return AjaxResult.success();
}
}

240
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java
View File

@ -134,7 +134,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(),
EApprovalBusiness.ORDER_RETURN.getValue(),
EApprovalBusiness.ORDER_CANCEL.getValue(),
EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue(),
// EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue(),
EApprovalBusiness.SELF_DELIVERY_MANAGE.getValue(),
EApprovalBusiness.ORDER_DEDUCTION.getValue()
),
@ -1249,25 +1249,27 @@ 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());
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());
// 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(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 = iSystemConfigServiceApi.getBonusSystemConfig(orderCancelParam.getPkCountry(), ESystemConfig.EXPAND_CAP_METHOD.getKey()).getData();
@ -1302,9 +1304,11 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
}
// 校验订单是否存在进行中的签呈
if (iSaOrderChargeLogService.checkOrderApprovalExist(
Arrays.asList(EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue(), EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(),
EApprovalBusiness.ORDER_RETURN.getValue(), approveBusiness,
EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue()
Arrays.asList(EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue(),
EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(),
EApprovalBusiness.ORDER_RETURN.getValue(),
approveBusiness
// EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue()
),
Collections.singletonList(orderCancelParam.getOrderCode()), orderCancelParam.getPkCountry(), businessCode) > 0) {
validateCancelOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EXIST_OTHER_APPROVE));
@ -1315,11 +1319,24 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
orderCancelParam.getCancelType().equals(ECancelOrderType.SINGLE_RETREAT_ORDER.getValue()) ||
orderCancelParam.getCancelType().equals(ECancelOrderType.MERGE_RETREAT_ORDER.getValue())) {
// 单点撤单 合并撤单
if (EOrderType.REGISTER_ORDER.getValue() != saOrderExt.getOrderType() &&
EOrderType.SPECIAL_REGISTER_ORDER.getValue() != saOrderExt.getOrderType()) {
if (EOrderType.REGISTER_ORDER.getValue() != saOrderExt.getOrderType()
&& EOrderType.SPECIAL_REGISTER_ORDER.getValue() != saOrderExt.getOrderType()) {
validateCancelOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.REGISTER_ORDER_CANCEL));
return validateCancelOrderVO;
}
// 验证是否存在签呈
// 校验各会员是否有进行中的签呈
if (businessCode == null || businessCode.length == 0) {
List<Long> pkMemberList = new ArrayList<>();
pkMemberList.add(cuMember.getPkId());
Map<Long, ApprovalMemberNumDTO> resultMap = iApprovalServiceApi.queryProcessingApproval(pkMemberList, cuMember.getPkSettleCountry()).getData();
if (resultMap.size() > 0) {
validateCancelOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.MEMBER_EXIST_NO_FISH_DOCUMENT));
return validateCancelOrderVO;
}
}
// 验证账号是否有钱
CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(saOrderExt.getPkMember()).build();
cuMemberAccount.setPkCountry(cuMember.getPkSettleCountry());
@ -1335,23 +1352,14 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
validateCancelOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.MEMBER_ACCOUNT_NOT_ZERO));
return validateCancelOrderVO;
}
// 验证是否存在签呈
// 校验各会员是否有进行中的签呈
if (businessCode == null || businessCode.length == 0) {
List<Long> pkMemberList = new ArrayList<>();
pkMemberList.add(cuMember.getPkId());
Map<Long, ApprovalMemberNumDTO> resultMap = iApprovalServiceApi.queryProcessingApproval(pkMemberList, cuMember.getPkSettleCountry()).getData();
if (resultMap.size() > 0) {
validateCancelOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.MEMBER_EXIST_NO_FISH_DOCUMENT));
return validateCancelOrderVO;
}
}
// 验证是否存在其他订单
Integer count = iSaOrderService.querySaleOrderByPkMember(cuMember.getPkSettleCountry(), cuMember.getPkId(), Collections.singletonList(EOrderType.RENEWAL_ORDER.getValue()));
if (count > 1) {
validateCancelOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.MEMBER_OTHER_ORDER));
return validateCancelOrderVO;
}
// 合并撤单、退单时需要验证伞下会员
if (orderCancelParam.getCancelType().equals(ECancelOrderType.MERGE_CANCEL_ORDER.getValue()) ||
orderCancelParam.getCancelType().equals(ECancelOrderType.MERGE_RETREAT_ORDER.getValue())) {
@ -1429,6 +1437,32 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
// 存在空单，空单从cu_member_register获取
validateCancelOrderVO.setUpdSaOrder(saOrderList.get(1));
}
} else if (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType()
&& EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend()) {
// 注册转复购订单
// 验证账号是否有钱
CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(saOrderExt.getPkMember()).build();
cuMemberAccount.setPkCountry(cuMember.getPkSettleCountry());
List<CuMemberAccountExt> cuMemberAccountExtList = iMemberAccountServiceApi.queryMemberAccountByCondition(cuMemberAccount).getData();
if (cuMemberAccountExtList.size() == 0) {
validateCancelOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.NOT_EXIST_MEMBER_ACCOUNT));
return validateCancelOrderVO;
}
CuMemberAccountExt cuMemberAccountExt = cuMemberAccountExtList.get(0);
if (ComputeUtil.compareValue(ComputeUtil.computeAddNum(cuMemberAccountExt.getAccount1(), cuMemberAccountExt.getAccount2(), cuMemberAccountExt.getAccount4(),
cuMemberAccountExt.getAccount3(), cuMemberAccountExt.getAccount5()))) {
// 2025.06.05 添加需求（148），撤销注册类订单，如果会员账户存在政策币或者重消币，不能进行撤单
validateCancelOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.MEMBER_ACCOUNT_NOT_ZERO));
return validateCancelOrderVO;
}
// 验证是否存在其他订单
Integer count = iSaOrderService.querySaleOrderByPkMember(cuMember.getPkSettleCountry(), cuMember.getPkId(), Collections.singletonList(EOrderType.RENEWAL_ORDER.getValue()));
if (count > 1) {
// 会员存在其它订单
validateCancelOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.MEMBER_OTHER_ORDER));
return validateCancelOrderVO;
}
}
}
validateCancelOrderVO.setSaOrderExt(saOrderExt);
@ -1455,9 +1489,9 @@ 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<BusinessLogDTO> dtoList = new ArrayList<>();
@ -1544,9 +1578,9 @@ 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;
}
// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
// approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
// }
// 本次业务修改费用
Map<Long, OrderQueryChargeDTO> queryChargeMap = null;
if (orderCancelParam.getCancelRoad() == null || orderCancelParam.getCancelRoad() != 2) {
@ -1618,15 +1652,15 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
}
}
} else {
if (EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue() == approveBusiness.getValue()) {
content.append("申请撤销产品：");
for (OrderCancelDetailParam orderCancelDetailParam : orderCancelParam.getOrderCancelDetailParamList()) {
content.append(orderCancelDetailParam.getProductName()).append("，");
}
} else {
content.append("申请撤销订单");
}
// if (EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue() == approveBusiness.getValue()) {
// content.append("申请撤销产品：");
// for (OrderCancelDetailParam orderCancelDetailParam : orderCancelParam.getOrderCancelDetailParamList()) {
// content.append(orderCancelDetailParam.getProductName()).append("，");
// }
//
// } else {
content.append("申请撤销订单");
// }
}
// 封装业务操作日志内容
@ -1703,9 +1737,9 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
// 所属国家
Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry();
EApprovalBusiness approvalBus = EApprovalBusiness.ORDER_CANCEL;
if (EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue() == approvalBusiness) {
approvalBus = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
}
// if (EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue() == approvalBusiness) {
// approvalBus = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
// }
if (this.updateSaOrderChargeLog(approvalBus, approvalBusinessResultDTO.getBusinessCode(), pkCountry, userId, EAgentApprovalStatus.APPROVED, approvalBusinessResultDTO.getApproveRemark())) {
iSaOrderService.revokeSaOrderByOrderCode(approvalBusinessResultDTO.getSysUser().getUserId(), orderCancelParam, validateCancelOrderVO);
}
@ -1739,9 +1773,9 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_NOT_EXISTS);
}
EApprovalBusiness eApprovalBusiness = EApprovalBusiness.ORDER_CANCEL;
if (EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue() == approvalBusiness) {
eApprovalBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
}
// if (EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue() == approvalBusiness) {
// eApprovalBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
// }
if (this.updateSaOrderChargeLog(eApprovalBusiness, approvalBusinessResultDTO.getBusinessCode(), pkCountry, userId, EAgentApprovalStatus.REFUSE, approvalBusinessResultDTO.getApproveRemark())) {
// 更新订单修改记录成功
// 驳回业务处理（扣款回退）
@ -2331,17 +2365,22 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
@Override
public MyOrderVO checkSelfOrder(Long userId, MyOrderVO myOrderVO) {
if (null == myOrderVO.getOrderType() || null == myOrderVO.getOrderCode()) {
// 订单类型、编号不能为空
myOrderVO.setMsg(MemberMsgConstants.REQUIRED_NOT_EMPTY);
return myOrderVO;
}
String lastOrderCode = iSaOrderService.lastOrderList(userId, myOrderVO.getPkCountry());
if (StringUtils.isEmpty(lastOrderCode) || !lastOrderCode.equals(myOrderVO.getOrderCode())) {
// 判断是否最新订单，不然不能撤单
myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.CHECK_MEMBER_LAST_ORDER));
return myOrderVO;
}
int approveBusiness = EApprovalBusiness.ORDER_CANCEL.getValue();
// 查询订单
SaOrderExt saOrderExt = iSaOrderService.queryOrderByCode(myOrderVO.getOrderCode(), myOrderVO.getPkCountry());
if (saOrderExt == null || EOrderStatus.WAIT_PAY.getValue() == saOrderExt.getOrderStatus()) {
// 未付款订单不能撤
myOrderVO.setMsg(SaOrderMsgConstants.ORDER_EMPTY);
return myOrderVO;
}
@ -2384,9 +2423,10 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
}
// 校验订单是否存在进行中的签呈
if (iSaOrderChargeLogService.checkOrderApprovalExist(
Arrays.asList(EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue(), EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(),
EApprovalBusiness.ORDER_RETURN.getValue(), approveBusiness,
EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue()
Arrays.asList(EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue(),
EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(),
EApprovalBusiness.ORDER_RETURN.getValue(), approveBusiness
// EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue()
),
Collections.singletonList(myOrderVO.getOrderCode()), myOrderVO.getPkCountry()) > 0) {
myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EXIST_OTHER_APPROVE));
@ -2395,51 +2435,36 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
//注册订单撤单验证
if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue()
|| myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()) {
//校验会员是否存在推荐或安置
// 校验会员是否存在推荐或安置
if (iMemberServiceApi.checkLowerMember(myOrderVO.getPkMember()).getData()) {
myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.CHECK_MEMBER_LOWER_EXIST));
return myOrderVO;
}
// 验证是否存在其他订单
Integer count = iSaOrderService.querySaleOrderByPkMember(cuMember.getPkSettleCountry(), cuMember.getPkId(), Collections.singletonList(EOrderType.RENEWAL_ORDER.getValue()));
if (count > 1) {
myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.MEMBER_OTHER_ORDER));
// 验证账号是否有钱
CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(saOrderExt.getPkMember()).build();
cuMemberAccount.setPkCountry(cuMember.getPkSettleCountry());
List<CuMemberAccountExt> cuMemberAccountExtList = iMemberAccountServiceApi.queryMemberAccountByCondition(cuMemberAccount).getData();
if (cuMemberAccountExtList.size() == 0) {
myOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.NOT_EXIST_MEMBER_ACCOUNT));
return myOrderVO;
}
CuMemberAccountExt cuMemberAccountExt = cuMemberAccountExtList.get(0);
if (ComputeUtil.compareValue(ComputeUtil.computeAddNum(cuMemberAccountExt.getAccount1(), cuMemberAccountExt.getAccount2(), cuMemberAccountExt.getAccount4(),
cuMemberAccountExt.getAccount3(), cuMemberAccountExt.getAccount5()))) {
// 2025.06.05 添加需求（148），撤销注册类订单，如果会员账户存在政策币或者重消币，不能进行撤单
myOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.MEMBER_ACCOUNT_NOT_ZERO));
return myOrderVO;
}
// 查询用户伞下所有会员
List<CuMemberExt> cuMemberList = iMemberServiceApi.queryPlaceSponsorUnderUmbrella(saOrderExt.getPkMember()).getData();
cuMemberList.add(BeanUtil.copyProperties(cuMember, CuMemberExt.class));
List<OrderCancelRegisterMemberVO> memberList = new ArrayList<>(cuMemberList.size());
// 验证，伞下会员是否存在报单中心
Set<Long> centerIdList = new HashSet<>();
for (CuMemberExt cuMemberExt : cuMemberList) {
centerIdList.add(cuMemberExt.getPkCenterCode());
memberList.add(OrderCancelRegisterMemberVO.builder()
.pkMember(cuMemberExt.getPkId())
.memberCode(cuMemberExt.getMemberCode())
.memberName(cuMemberExt.getMemberName())
.build());
}
if (memberList.stream().anyMatch(orderCancelRegisterMemberVO ->
centerIdList.contains(orderCancelRegisterMemberVO.getPkMember()))) {
myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.EXIST_CENTER_ORDER));
// 验证是否存在其他订单
Integer count = iSaOrderService.querySaleOrderByPkMember(cuMember.getPkSettleCountry(), cuMember.getPkId(), Collections.singletonList(EOrderType.RENEWAL_ORDER.getValue()));
if (count > 1) {
// 会员存在其它订单
myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.MEMBER_OTHER_ORDER));
return myOrderVO;
}
myOrderVO.setMemberList(memberList);
// 验证伞下所有会员的账号是否有钱
List<Long> underMemberList = cuMemberList.stream().map(CuMemberExt::getPkId).collect(Collectors.toList());
Map<Long, CuMemberAccount> revokeMemberBySaOrder = getRevokeMemberBySaOrder(underMemberList);
for (Long pkMember : revokeMemberBySaOrder.keySet()) {
CuMemberAccount memberAccount = revokeMemberBySaOrder.get(pkMember);
if (ComputeUtil.compareValue(ComputeUtil.computeAddNum(memberAccount.getAccount1(), memberAccount.getAccount2(), memberAccount.getAccount4()))) {
myOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.UNDER_UMBRELLA_ACCOUNT_NOT_ZERO));
return myOrderVO;
}
}
}
// 升级撤单验证
if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
} else if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
// 升级订单需要验证是否从最后一单升级订单撤销
List<SaOrder> saOrderList = iSaOrderService.querySaleOrderByPkMember(cuMember.getPkSettleCountry(), cuMember.getPkId(),
Arrays.asList(EOrderType.REGISTER_ORDER.getValue(), EOrderType.UPGRADE_ORDER.getValue()),
@ -2452,6 +2477,37 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
// 存在空单，空单从cu_member_register获取
myOrderVO.setUpdSaOrder(saOrderList.get(1));
}
} else if (myOrderVO.getOrderType() == EOrderType.REPURCHASE_ORDER.getValue() && EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend()) {
// 注册转复购订单撤单处理
// 校验会员是否存在推荐或安置
if (iMemberServiceApi.checkLowerMember(myOrderVO.getPkMember()).getData()) {
myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.CHECK_MEMBER_LOWER_EXIST));
return myOrderVO;
}
// 验证账号是否有钱
CuMemberAccount cuMemberAccount = CuMemberAccount.builder().pkMember(saOrderExt.getPkMember()).build();
cuMemberAccount.setPkCountry(cuMember.getPkSettleCountry());
List<CuMemberAccountExt> cuMemberAccountExtList = iMemberAccountServiceApi.queryMemberAccountByCondition(cuMemberAccount).getData();
if (cuMemberAccountExtList.size() == 0) {
myOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.NOT_EXIST_MEMBER_ACCOUNT));
return myOrderVO;
}
CuMemberAccountExt cuMemberAccountExt = cuMemberAccountExtList.get(0);
if (ComputeUtil.compareValue(ComputeUtil.computeAddNum(cuMemberAccountExt.getAccount1(), cuMemberAccountExt.getAccount2(), cuMemberAccountExt.getAccount4(),
cuMemberAccountExt.getAccount3(), cuMemberAccountExt.getAccount5()))) {
// 2025.06.05 添加需求（148），撤销注册类订单，如果会员账户存在政策币或者重消币，不能进行撤单
myOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.MEMBER_ACCOUNT_NOT_ZERO));
return myOrderVO;
}
// 验证是否存在其他订单
Integer count = iSaOrderService.querySaleOrderByPkMember(cuMember.getPkSettleCountry(), cuMember.getPkId(), Collections.singletonList(EOrderType.RENEWAL_ORDER.getValue()));
if (count > 1) {
// 会员存在其它订单
myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.MEMBER_OTHER_ORDER));
return myOrderVO;
}
}
myOrderVO.setSaOrderExt(saOrderExt);
return myOrderVO;

306
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -758,6 +758,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
GradeDTO gradeDTO = iGradeServiceApi.getGrade(newCuMember.getPkRegisterGrade()).getData();
if (EGrade.HAI_FAN.getValue() == gradeDTO.getGradeValue()) {
saOrderExt.setOrderType(EOrderType.REPURCHASE_ORDER.getValue());
// 注册 转 复购 补一下特殊订单类型，后面好处理撤单使用
saOrderExt.setOrderTypeExtend(EOrderTypeExtend.REG_REP.getValue());
}
// 保存订单信息
@ -1380,9 +1382,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> 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<Long, OrderQueryChargeDTO> queryChargeMap = iOrderBusinessService.queryChargeLog(Collections.singletonList(validateCancelOrderVO.getSaOrderExt()),
approveBusiness, orderCancelParam.getPkCountry());
if (queryChargeMap != null && queryChargeMap.containsKey(saOrderExt.getPkId())) {
@ -1411,163 +1413,160 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
}
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
List<OrderCancelDetailParam> orderCancelDetailParamList = orderCancelParam.getOrderCancelDetailParamList();
List<Long> 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<SaOrderItems> 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);
// if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
// List<OrderCancelDetailParam> orderCancelDetailParamList = orderCancelParam.getOrderCancelDetailParamList();
// List<Long> 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<SaOrderItems> 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();
// // 删除发货单
// iSaDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), pkOrderItemList);
// updateSaOrder(pkApprove, saOrderExt, currentDateTime);
// // 删除订单明细
// if (!iSaOrderItemsService.updateOrderItemsById(pkOrderItemList, pkApprove, currentDateTime)) {
// throw new RuntimeException("更新订单失败");
// }
// if (!iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, pkOrderItemList, businessCommissionDTO).getData()) {
// throw new RuntimeException("撤单失败");
// }
// } else {
// 删除订单
saOrderExt.setDelFlag(EDelFlag.DELETE.getValue());
Date currentDate = DateUtils.currentDateTime();
// 删除发货单
iSaDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), null);
// 修改订单
updateSaOrder(pkApprove, saOrderExt, currentDate);
// 删除订单明细
if (!iSaOrderItemsService.updateOrderItems(saOrderExt)) {
throw new RuntimeException("更新订单失败");
}
// 撤销注册订单 单点撤单
if (ECancelOrderType.SINGLE_CANCEL_ORDER.getValue() == orderCancelParam.getCancelType()) {
// 单点撤单，变死点
R<Boolean> tmpR = iMemberServiceApi.singleRevokeMemberByRegisterOrder(pkApprove, saOrderExt, businessCommissionDTO);
if (!tmpR.isSuccess()) {
throw new RuntimeException("撤单失败 " + tmpR.getMsg());
}
// 修改订单
Date currentDateTime = DateUtils.currentDateTime();
// 删除发货单
iSaDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), pkOrderItemList);
updateSaOrder(pkApprove, saOrderExt, currentDateTime);
// 删除订单明细
if (!iSaOrderItemsService.updateOrderItemsById(pkOrderItemList, pkApprove, currentDateTime)) {
throw new RuntimeException("更新订单失败");
} else if (ECancelOrderType.MERGE_CANCEL_ORDER.getValue() == orderCancelParam.getCancelType()) {
// 合并撤单，撤下面所有
List<Long> memberList = validateCancelOrderVO.getMemberList().stream().map(OrderCancelRegisterMemberVO::getPkMember).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(memberList)) {
// 撤销所有订单明细表
iSaOrderItemsService.updateOrderItemsByMemberList(memberList, pkApprove, currentDate);
// 撤销所有订单主表
baseMapper.updateSaOrderByMember(memberList, pkApprove, currentDate);
}
if (!iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, pkOrderItemList, businessCommissionDTO).getData()) {
throw new RuntimeException("撤单失败");
R<Boolean> tmpR = iMemberServiceApi.mergeRevokeMemberByRegisterOrder(pkApprove, memberList, validateCancelOrderVO.getSaOrderMap(), businessCommissionDTO);
if (!tmpR.isSuccess()) {
throw new RuntimeException("撤单失败 " + tmpR.getMsg());
}
} else {
// 删除订单
saOrderExt.setDelFlag(EDelFlag.DELETE.getValue());
Date currentDate = DateUtils.currentDateTime();
// 删除发货单
iSaDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), null);
// 修改订单
updateSaOrder(pkApprove, saOrderExt, currentDate);
// 删除订单明细
if (!iSaOrderItemsService.updateOrderItems(saOrderExt)) {
throw new RuntimeException("更新订单失败");
// 其他撤单 撤销升级订单
CuMember cuMember = getCuMemberByKey(saOrderExt.getPkMember());
if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()
|| EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()
) {
SaOrder updSaOrder = validateCancelOrderVO.getUpdSaOrder();
// 计算等级
// 获取升级订单
// 空单注册，从cu_member_register中获取
if (updSaOrder == null) {
CuMemberRegister cuMemberRegister = iMemberServiceApi.queryCuMemberRegister(saOrderExt.getPkMember()).getData();
cuMember.setPkRegisterGrade(cuMemberRegister.getPkRegisterGrade());
cuMember.setPkSettleGrade(cuMemberRegister.getPkRegisterGrade());
cuMember.setConsumeMoney(BigDecimal.ZERO);
cuMember.setConsumeAchieve(cuMemberRegister.getConsumeAchieve());
// 查询最新一条手动升级记录
CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId()).getData();
if (null != cuMemberLevel) {
// 存在手动升级
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());
}
} else {
OrderReturn orderReturn = OrderReturn.builder().isEnough(false).build();
GradeDTO gradeDTO = calculateGradeDTO(EOrderType.UPGRADE_ORDER.getValue(), cuMember.getPkSettleCountry(), cuMember.getPkId(),
validateCancelOrderVO.getUpdSaOrder(), orderReturn);
cuMember.setPkRegisterGrade(gradeDTO.getPkId());
cuMember.setPkSettleGrade(gradeDTO.getPkId());
// 查询最新一条手动升级记录
CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId()).getData();
if (null != cuMemberLevel) {
// 存在手动升级
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());
}
// 查询最新的手动开通注册权限的记录
CuMemberServiceLog cuMemberServiceLog = iCuMemberServiceLogServiceApi.selectTopData(cuMember.getPkId(), EApprovalBusiness.REGISTER_POWER_STATE.getValue(), EApproveStatus.FINISH.getValue()).getData();
if (null != cuMemberServiceLog && StringUtils.isNotEmpty(cuMemberServiceLog.getNewValue())) {
// 存在手动开通
if (Integer.parseInt(cuMemberServiceLog.getNewValue()) > gradeDTO.getRegisterAuthority()) {
// 手动开通注册权限 大于 降级之后的权限，则保留手动开通的权限
cuMember.setRegisterAuthority(Integer.parseInt(cuMemberServiceLog.getNewValue()));
} else {
cuMember.setRegisterAuthority(gradeDTO.getRegisterAuthority());
}
}
SaOrder saOrder = baseMapper.queryLastRegisterOrUpdate(cuMember.getPkId(), cuMember.getPkCountry());
if (null != saOrder) {
// 撤消升级单之后，获取注册或者最后的升级单，填充注册金额
cuMember.setConsumeMoney(saOrder.getOrderAmount());
} else {
// 没有注册或者升级单，则直接扣减升级单的订单金额
cuMember.setConsumeMoney(ComputeUtil.computeSubtract(cuMember.getConsumeMoney(), saOrderExt.getOrderAmount()));
}
cuMember.setConsumeAchieve(gradeDTO.getStartValue());
}
} else if (EOrderType.PICK_ORDER.getValue() == saOrderExt.getOrderType()) {
// 提货订单
if (!iAcPickService.cancelPickOrder(saOrderExt.getOrderCode(), pkApprove)) {
throw new RuntimeException("撤销订单退还提货失败");
}
}
// 撤销注册订单 单点撤单
if (ECancelOrderType.SINGLE_CANCEL_ORDER.getValue() == orderCancelParam.getCancelType()) {
// 单点撤单，变死点
if (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType()
&& EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend()) {
// 注册转复购订单，走的是注册订单的撤单流程
R<Boolean> tmpR = iMemberServiceApi.singleRevokeMemberByRegisterOrder(pkApprove, saOrderExt, businessCommissionDTO);
if (!tmpR.isSuccess()) {
throw new RuntimeException("撤单失败 " + tmpR.getMsg());
}
} else if (ECancelOrderType.MERGE_CANCEL_ORDER.getValue() == orderCancelParam.getCancelType()) {
// 合并撤单，撤下面所有
List<Long> memberList = validateCancelOrderVO.getMemberList().stream().map(OrderCancelRegisterMemberVO::getPkMember).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(memberList)) {
// 撤销所有订单明细表
iSaOrderItemsService.updateOrderItemsByMemberList(memberList, pkApprove, currentDate);
// 撤销所有订单主表
baseMapper.updateSaOrderByMember(memberList, pkApprove, currentDate);
}
R<Boolean> tmpR = iMemberServiceApi.mergeRevokeMemberByRegisterOrder(pkApprove, memberList, validateCancelOrderVO.getSaOrderMap(), businessCommissionDTO);
if (!tmpR.isSuccess()) {
throw new RuntimeException("撤单失败 " + tmpR.getMsg());
}
} else {
// 其他撤单 撤销升级订单
CuMember cuMember = getCuMemberByKey(saOrderExt.getPkMember());
if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()
|| EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()
) {
SaOrder updSaOrder = validateCancelOrderVO.getUpdSaOrder();
// 计算等级
// 获取升级订单
// 空单注册，从cu_member_register中获取
if (updSaOrder == null) {
CuMemberRegister cuMemberRegister = iMemberServiceApi.queryCuMemberRegister(saOrderExt.getPkMember()).getData();
cuMember.setPkRegisterGrade(cuMemberRegister.getPkRegisterGrade());
cuMember.setPkSettleGrade(cuMemberRegister.getPkRegisterGrade());
cuMember.setConsumeMoney(BigDecimal.ZERO);
cuMember.setConsumeAchieve(cuMemberRegister.getConsumeAchieve());
// 查询最新一条手动升级记录
CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId()).getData();
if (null != cuMemberLevel) {
// 存在手动升级
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());
}
} else {
OrderReturn orderReturn = OrderReturn.builder().isEnough(false).build();
GradeDTO gradeDTO = calculateGradeDTO(EOrderType.UPGRADE_ORDER.getValue(), cuMember.getPkSettleCountry(), cuMember.getPkId(),
validateCancelOrderVO.getUpdSaOrder(), orderReturn);
cuMember.setPkRegisterGrade(gradeDTO.getPkId());
cuMember.setPkSettleGrade(gradeDTO.getPkId());
// 查询最新一条手动升级记录
CuMemberLevel cuMemberLevel = iCuMemberDetailServiceApi.queryLastManualUpgrade(cuMember.getPkId()).getData();
if (null != cuMemberLevel) {
// 存在手动升级
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());
}
// 查询最新的手动开通注册权限的记录
CuMemberServiceLog cuMemberServiceLog = iCuMemberServiceLogServiceApi.selectTopData(cuMember.getPkId(), EApprovalBusiness.REGISTER_POWER_STATE.getValue(), EApproveStatus.FINISH.getValue()).getData();
if (null != cuMemberServiceLog && StringUtils.isNotEmpty(cuMemberServiceLog.getNewValue())) {
// 存在手动开通
if (Integer.parseInt(cuMemberServiceLog.getNewValue()) > gradeDTO.getRegisterAuthority()) {
// 手动开通注册权限 大于 降级之后的权限，则保留手动开通的权限
cuMember.setRegisterAuthority(Integer.parseInt(cuMemberServiceLog.getNewValue()));
} else {
cuMember.setRegisterAuthority(gradeDTO.getRegisterAuthority());
}
}
SaOrder saOrder = baseMapper.queryLastRegisterOrUpdate(cuMember.getPkId(), cuMember.getPkCountry());
if (null != saOrder) {
// 撤消升级单之后，获取注册或者最后的升级单，填充注册金额
cuMember.setConsumeMoney(saOrder.getOrderAmount());
} else {
// 没有注册或者升级单，则直接扣减升级单的订单金额
cuMember.setConsumeMoney(ComputeUtil.computeSubtract(cuMember.getConsumeMoney(), saOrderExt.getOrderAmount()));
}
cuMember.setConsumeAchieve(gradeDTO.getStartValue());
}
} else if (EOrderType.PICK_ORDER.getValue() == saOrderExt.getOrderType()) {
// 提货订单
if (!iAcPickService.cancelPickOrder(saOrderExt.getOrderCode(), pkApprove)) {
throw new RuntimeException("撤销订单退还提货失败");
}
}
if (!iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, null, businessCommissionDTO).getData()) {
throw new RuntimeException("撤单处理会员失败");
}
}
}
// 订单撤销成功回退可用量
// 验证订单是否有仓库，有仓库的可以回退，没有的回退
if (saOrderExt.getPkStorehouse() != null) {
saOrderExt.setPkModified(pkApprove);
if (saOrderExt.getOrderItemsExtList() == null && CollectionUtil.isNotEmpty(saOrderExt.getOrderItemsList())) {
List<SaOrderItemsExt> saOrderItemsExtList = new ArrayList<>();
for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) {
SaOrderItemsExt saOrderItemsExt = BeanUtil.copyProperties(saOrderItems, SaOrderItemsExt.class);
saOrderItemsExtList.add(saOrderItemsExt);
}
saOrderExt.setOrderItemsExtList(saOrderItemsExtList);
}
}
// }
try {
// 推送MQ的列表
List<SaOrderExt> mqList = new ArrayList<>();
@ -2260,7 +2259,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 撤销注册订单(注册订单,海粉订单,特殊注册订单)
if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue()
|| myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()) {
|| myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()
|| (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType() && EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend())
) {
// 逻辑删除会员
if (!iMemberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) {
throw new RuntimeException("撤单失败");
@ -2343,19 +2344,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
}
try {
// 验证订单是否有仓库，有仓库的可以回退，没有的回退
if (saOrderExt.getPkStorehouse() != null) {
saOrderExt.setPkModified(pkApprove);
if (saOrderExt.getOrderItemsExtList() == null && CollectionUtil.isNotEmpty(saOrderExt.getOrderItemsList())) {
List<SaOrderItemsExt> saOrderItemsExtList = new ArrayList<>();
for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) {
SaOrderItemsExt saOrderItemsExt = BeanUtil.copyProperties(saOrderItems, SaOrderItemsExt.class);
saOrderItemsExtList.add(saOrderItemsExt);
}
saOrderExt.setOrderItemsExtList(saOrderItemsExtList);
}
}
// 推送MQ，处理活动回退
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_CANCEL_EXCHANGE, RabbitMqConstants.ORDER_CANCEL_KEY, Collections.singletonList(saOrderExt));

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/MyOrderVO.java
View File

@ -18,11 +18,7 @@ import java.util.Date;
import java.util.List;
/**
* @Description: 我的订单返回VO
* @Author: jiang chao
* @Time: 2023/1/13 16:13
* @Classname: MyOrderVO
* @PackageName: com.hzs.sale.order.vo
* 我的订单返回VO
*/
@NoArgsConstructor
@AllArgsConstructor

9
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductMapper.java
View File

@ -3,7 +3,6 @@ package com.hzs.sale.product.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.sale.ext.BdProductExt;
import com.hzs.common.domain.sale.product.BdProduct;
import com.hzs.common.domain.sale.product.BdProductSpecs;
import com.hzs.sale.product.controller.manage.params.ProductParams;
import com.hzs.sale.product.param.SupplierProductCensusParam;
import com.hzs.sale.product.vo.ProductVo;
@ -11,7 +10,6 @@ import com.hzs.sale.product.vo.SupplierProductCensusVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Set;
public interface BdProductMapper extends BaseMapper<BdProduct> {
@ -30,11 +28,6 @@ public interface BdProductMapper extends BaseMapper<BdProduct> {
*/
List<ProductVo> selectByQueryList(ProductParams productParams);
/*
* @description: 根据规格、主键查询产品
**/
List<BdProductExt> queryProductExtBySpecsId(@Param("productSpecsList") List<BdProductSpecs> productSpecsList, @Param("pkCountry") Integer pkCountry);
/**
* 查询带有规格的产品列表
*
@ -45,6 +38,7 @@ public interface BdProductMapper extends BaseMapper<BdProduct> {
/**
* 供应商产品统计
*
* @param supplierProductCensusParam
* @return
*/
@ -52,6 +46,7 @@ public interface BdProductMapper extends BaseMapper<BdProduct> {
/**
* 查询产品信息
*
* @param productId
* @return
*/

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdSpecsMapper.java
View File

@ -3,14 +3,8 @@ package com.hzs.sale.product.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.sale.classify.BdSpecs;
/**
* <p>
* 产品规格表 Mapper 接口
* </p>
*
* @author hzs
* @since 2022-08-27
*/
public interface BdSpecsMapper extends BaseMapper<BdSpecs> {

40
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/provider/IProductServiceProvider.java
View File

@ -3,38 +3,21 @@ package com.hzs.sale.product.provider;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.hzs.common.core.domain.R;
import com.hzs.common.domain.sale.classify.BdSpecs;
import com.hzs.common.domain.sale.ext.BdProductExt;
import com.hzs.common.domain.sale.product.BdProduct;
import com.hzs.common.domain.sale.product.BdProductSpecs;
import com.hzs.sale.product.IProductServiceApi;
import com.hzs.sale.product.controller.manage.params.ProductParams;
import com.hzs.sale.product.dto.ProductDTO;
import com.hzs.sale.product.dto.ProductParamDTO;
import com.hzs.sale.product.service.IBdProductService;
import com.hzs.sale.product.service.IBdSpecsService;
import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.*;
@Slf4j
@DubboService
public class IProductServiceProvider implements IProductServiceApi {
@Autowired
private IBdProductService iBdProductService;
@Autowired
private IBdSpecsService iBdSpecsService;
/**
* 根据产品id 查询产品
*
* @param productId
* @return
*/
@Override
public R<ProductDTO> getProduct(Integer productId) {
BdProduct product = iBdProductService.getProduct(productId);
@ -46,12 +29,6 @@ public class IProductServiceProvider implements IProductServiceApi {
return R.ok(productDTO);
}
@Override
public R<List<BdProductExt>> queryProductDtoById(List<BdProductSpecs> productSpecsList, Integer pkCountry) {
List<BdProductExt> productExtList = iBdProductService.queryProductExtById(productSpecsList, pkCountry);
return R.ok(productExtList);
}
@Override
public R<ProductDTO> getProduct(String productCode) {
LambdaQueryWrapper<BdProduct> queryWrapper = new LambdaQueryWrapper<>();
@ -65,21 +42,4 @@ public class IProductServiceProvider implements IProductServiceApi {
return R.ok(productDTO);
}
@Override
public R<List<BdSpecs>> queryBdSpecsByIdList(List<Integer> idList) {
return R.ok(iBdSpecsService.queryBdSpecsByIdList(idList));
}
/**
* 产品新增
*
* @param productParamDTO
* @return
*/
@Override
public R<String> saveProduct(ProductParamDTO productParamDTO, LoginUser loginUser) {
ProductParams productParams = BeanUtil.copyProperties(productParamDTO, ProductParams.class);
return R.ok(iBdProductService.saveProduct(productParams, loginUser));
}
}

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductService.java
View File

@ -3,7 +3,6 @@ package com.hzs.sale.product.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.sale.ext.BdProductExt;
import com.hzs.common.domain.sale.product.BdProduct;
import com.hzs.common.domain.sale.product.BdProductSpecs;
import com.hzs.sale.product.controller.manage.params.ProductParams;
import com.hzs.sale.product.param.SupplierProductCensusParam;
import com.hzs.sale.product.vo.ProductVo;
@ -26,11 +25,6 @@ public interface IBdProductService extends IService<BdProduct> {
*/
BdProduct getProduct(Integer pkProduct);
/*
* 根据规格、主键查询产品
**/
List<BdProductExt> queryProductExtById(List<BdProductSpecs> productSpecsList, Integer pkCountry);
/**
* 新增商品信息
*

13
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdSpecsService.java
View File

@ -2,32 +2,23 @@ package com.hzs.sale.product.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.sale.classify.BdSpecs;
import com.hzs.common.domain.sale.classify.BdSpecsType;
import java.util.List;
/**
* <p>
* 产品规格表 服务类
* </p>
*
* @author hzs
* @since 2022-08-27
*/
public interface IBdSpecsService extends IService<BdSpecs> {
/**
* 根据id查询产品规格表
*
* @param specsId
*/
BdSpecs getSpecs(Integer specsId);
/*
* @description: 根据主键List查询规格
* @author: sui q
* @date: 2023/11/30 15:18
* @param: null null
* 根据主键List查询规格
**/
List<BdSpecs> queryBdSpecsByIdList(List<Integer> idList);

5
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductServiceImpl.java
View File

@ -65,11 +65,6 @@ public class BdProductServiceImpl extends ServiceImpl<BdProductMapper, BdProduct
return baseMapper.selectById(pkProduct);
}
@Override
public List<BdProductExt> queryProductExtById(List<BdProductSpecs> productSpecsList, Integer pkCountry) {
return baseMapper.queryProductExtBySpecsId(productSpecsList, pkCountry);
}
@Override
@Transactional(rollbackFor = Exception.class)
public String saveProduct(ProductParams productParams, LoginUser loginUser) {

13
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdSpecsServiceImpl.java
View File

@ -6,7 +6,6 @@ import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.constant.SystemFieldConstants;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.domain.sale.classify.BdSpecs;
import com.hzs.common.domain.sale.postage.BdPostage;
import com.hzs.sale.product.mapper.BdSpecsMapper;
import com.hzs.sale.product.service.IBdSpecsService;
import org.springframework.beans.factory.annotation.Autowired;
@ -15,23 +14,14 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 产品规格表 服务实现类
* </p>
*
* @author hzs
* @since 2022-08-27
*/
@Service
public class BdSpecsServiceImpl extends ServiceImpl<BdSpecsMapper, BdSpecs> implements IBdSpecsService {
@Autowired
private RedisService redisService;
/**
* 根据id查询产品规格表
* @param specsId
* @return
*/
@Override
public BdSpecs getSpecs(Integer specsId) {
String redisKey = CacheConstants.BD_SPECS + specsId;
@ -51,4 +41,5 @@ public class BdSpecsServiceImpl extends ServiceImpl<BdSpecsMapper, BdSpecs> impl
queryWrapper.in(SystemFieldConstants.PK_ID, idList);
return baseMapper.selectList(queryWrapper);
}
}

18
bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/service/impl/SaleApprovalBusiness.java
View File

@ -72,10 +72,10 @@ public class SaleApprovalBusiness implements ISaleApprovalBusiness {
// 撤销订单
str = iOrderBusinessService.cancelOrderApprovalAgree(approvalBusinessResultDTO, EApprovalBusiness.ORDER_CANCEL.getValue());
break;
case ORDER_CANCEL_PRODUCT:
// 撤销产品订单
str = iOrderBusinessService.cancelOrderApprovalAgree(approvalBusinessResultDTO, EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue());
break;
// case ORDER_CANCEL_PRODUCT:
// // 撤销产品订单
// str = iOrderBusinessService.cancelOrderApprovalAgree(approvalBusinessResultDTO, EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue());
// break;
case ORDER_CHANGE_ADDRESS:
// 订单修改地址
str = iOrderBusinessService.changeAddressApprovalAgree(approvalBusinessResultDTO);
@ -104,10 +104,10 @@ public class SaleApprovalBusiness implements ISaleApprovalBusiness {
// 撤销订单
str = iOrderBusinessService.cancelOrderApprovalReject(approvalBusinessResultDTO, EApprovalBusiness.ORDER_CANCEL.getValue());
break;
case ORDER_CANCEL_PRODUCT:
// 撤销产品订单
str = iOrderBusinessService.cancelOrderApprovalReject(approvalBusinessResultDTO, EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue());
break;
// case ORDER_CANCEL_PRODUCT:
// // 撤销产品订单
// str = iOrderBusinessService.cancelOrderApprovalReject(approvalBusinessResultDTO, EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue());
// break;
case ORDER_CHANGE_ADDRESS:
// 订单修改地址
str = iOrderBusinessService.changeAddressApprovalReject(approvalBusinessResultDTO);
@ -258,7 +258,7 @@ public class SaleApprovalBusiness implements ISaleApprovalBusiness {
}
return returnList;
case ORDER_CANCEL: // 撤销订单、单点撤单、合并撤单
case ORDER_CANCEL_PRODUCT: // 撤销产品
// case ORDER_CANCEL_PRODUCT: // 撤销产品
List<CancelOrderDTO> cancelOrderDTOList = new ArrayList<>(saOrderChargeLogList.size());
for (SaOrderChargeLogExt saOrderChargeLogExt : saOrderChargeLogList) {
OrderCancelParam orderCancelParam = JSONUtil.toBean(saOrderChargeLogExt.getAfterData(), OrderCancelParam.class);

16
bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml
View File

@ -540,20 +540,4 @@
)
</select>
<select id="querySaDeliverItemByOrder" resultType="com.hzs.common.domain.sale.deliver.SaDeliverItems">
select sdi.pk_id from sa_order so
inner join sa_deliver_items sdi
on so.pk_id = sdi.pk_order
inner join sa_deliver_bar_code sdc
on sdi.pk_id= sdc.pk_deliver_items
where sdi.del_flag = 0 and sdc.del_flag = 0
and so.order_code = #{orderCode}
<if test="itemIdList != null and itemIdList.size >0">
and sdi.pk_order_items in
<foreach collection="itemIdList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
</mapper>

16
bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdProductMapper.xml
View File

@ -181,22 +181,6 @@
order by bp.product_name
</select>
<select id="queryProductExtBySpecsId" resultMap="BdProduct">
<foreach collection="productSpecsList" item="item" separator=" union ">
select bp.pk_id,bp.product_code,bp.product_name,bp.pk_country,bp.cover,bc.pk_id
pk_specs_id,bc.pk_specs_type,bc.specs_name from bd_product bp
inner join bd_product_extend be
on bp.pk_id = be.pk_product
inner join bd_product_specs bs
on bp.pk_id=bs.pk_product
inner join bd_specs bc
on bc.pk_specs_type=bs.pk_specs_type
where bp.del_flag=0 and be.del_flag=0 and bs.del_flag=0 and bc.del_flag=0
and bp.pk_country= #{pkCountry} and bp.pk_id = #{item.pkProduct}
and bs.pk_specs_type = #{item.pkSpecsType} and bc.pk_id= #{item.pkId}
</foreach>
</select>
<select id="getSupplierProductCensus" resultType="com.hzs.sale.product.vo.SupplierProductCensusVo">
select
bc.CUST_NAME custName ,bp.COVER cover,bp.PRODUCT_NAME productName,bp.PK_CLASSIFY pkClassify,bp.PRODUCT_CODE

20
bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdSpecsMapper.xml
View File

@ -2,24 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzs.sale.product.mapper.BdSpecsMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hzs.common.domain.sale.classify.BdSpecs">
<result column="PK_ID" property="pkId" />
<result column="PK_SPECS_TYPE" property="pkSpecsType" />
<result column="SPECS_NAME" property="specsName" />
<result column="PK_TRANSACTION_KEY" property="pkTransactionKey" />
<result column="PK_CREATOR" property="pkCreator" />
<result column="CREATION_TIME" property="creationTime" />
<result column="PK_MODIFIED" property="pkModified" />
<result column="MODIFIED_TIME" property="modifiedTime" />
<result column="DEL_FLAG" property="delFlag" />
<result column="PK_COUNTRY" property="pkCountry" />
<result column="ENABLE_STATE" property="enableState" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
PK_ID, PK_SPECS_TYPE, SPECS_NAME, PK_TRANSACTION_KEY, PK_CREATOR, CREATION_TIME, PK_MODIFIED, MODIFIED_TIME, DEL_FLAG, PK_COUNTRY, ENABLE_STATE
</sql>
</mapper>

5
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java
View File

@ -141,11 +141,6 @@ public class SaOrderMsgConstants {
* 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单下商品已下架，不能购买
*/
public static final String ORDER_ITEM_OFF = "订单下商品已下架，不能购买";
/**
* 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单已经绑定条形码，建议解绑后在撤单！
*/
public static final String ORDER_BIND_BAR_CODE = "订单已经绑定条形码，建议解绑后在撤单！";
/**
* 请填写驳回信息 -- 请填写驳回信息
*/

8
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java
View File

@ -204,10 +204,10 @@ public enum EApprovalBusiness {
* 订单撤销订单
*/
ORDER_CANCEL(234, "撤销订单", EnumsPrefixConstants.APPROVAL_BUSINESS + "234"),
/**
* 订单撤销产品
*/
ORDER_CANCEL_PRODUCT(235, "撤销产品", EnumsPrefixConstants.APPROVAL_BUSINESS + "235"),
// /**
// * 订单撤销产品
// */
// ORDER_CANCEL_PRODUCT(235, "撤销产品", EnumsPrefixConstants.APPROVAL_BUSINESS + "235"),
/**
* 订单自提

15
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECancelOrderType.java
View File

@ -1,13 +1,10 @@
package com.hzs.common.core.enums;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 撤销订单类型
*
* @author: hzs
*/
@AllArgsConstructor
@Getter
@ -24,14 +21,14 @@ public enum ECancelOrderType {
MERGE_CANCEL_ORDER(2, "合并撤单", 0),
/**
* 其他整单撤单
* 撤销订单
*/
OTHER_CANCEL_ORDER(3, "其他整单撤单", 0),
OTHER_CANCEL_ORDER(3, "撤销订单", 0),
/**
* 其他部分撤单
*/
OTHER_CANCEL_PART_ORDER(4, "其他部分撤单", 0),
// /**
// * 其他部分撤单
// */
// OTHER_CANCEL_PART_ORDER(4, "其他部分撤单", 0),
/**
* 单点退单

5
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderTypeExtend.java
View File

@ -15,6 +15,11 @@ public enum EOrderTypeExtend {
*/
NORMAL(0, "正常", 0),
/**
* 注册转复购
*/
REG_REP(1, "注册转复购", 0),
;
/**

8
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/classify/BdSpecsType.java
View File

@ -14,12 +14,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 规格类型表
* </p>
*
* @author hzs
* @since 2022-08-27
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -67,7 +62,4 @@ public class BdSpecsType extends BaseEntity {
private Integer sort;
}

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/postage/BdPostage.java
View File

@ -11,9 +11,6 @@ import lombok.experimental.Accessors;
/**
* 邮费设置
*
* @author hzs
* @since 2022-08-27
*/
@Data
@EqualsAndHashCode(callSuper = false)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductSpecs.java
View File

@ -9,12 +9,7 @@ import lombok.*;
import lombok.experimental.Accessors;
/**
* <p>
* 规格明细表
* </p>
*
* @author hzs
* @since 2022-09-13
*/
@Data
@EqualsAndHashCode(callSuper = true)