## 分公司等级注册、升级订单不需要发货流程单独处理，产品进入到提货专区；

bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/BaseConfigVo.java

@@ -13,12 +13,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @BelongsProject: hzs_cloud
+ * 活动列表
- * @BelongsPackage: com.hzs.activity.controller.vo
- * @Author: yh
- * @CreateTime: 2023-04-20  15:13
- * @Description: 活动列表
- * @Version: 1.0
  */
 @Data
 public class BaseConfigVo implements Serializable {

bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.activity.pick.param.AcPickQueryParam;
 import com.hzs.activity.pick.vo.ApiPickListVO;
 import com.hzs.common.domain.activity.pick.AcPick;
-import com.hzs.common.domain.activity.pick.AcPickMemberLog;
 import com.hzs.common.domain.activity.pick.ext.AcPickExt;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,9 +12,6 @@ import java.util.List;
 
 /**
  * 提货基础表 Mapper 接口
- *
- * @author hzs
- * @since 2023-04-21
  */
 public interface AcPickMapper extends BaseMapper<AcPick> {
 
@@ -103,4 +99,12 @@ public interface AcPickMapper extends BaseMapper<AcPick> {
      */
     List<ApiPickListVO> pickList(@Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry);
 
+    /**
+     * 批量处理提货数据
+     *
+     * @param pickList
+     * @return
+     */
+    int batchSaveOrUpdatePick(@Param("pickList") List<AcPick> pickList);
+
 }

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

@@ -127,4 +127,12 @@ public interface IAcPickService extends IService<AcPick> {
      */
     BigDecimal postageHandle(AcPick acPick, Integer quantity, Integer recProvince, Integer recCity, Integer pkCountry);
 
+    /**
+     * 批量处理提货数据
+     *
+     * @param pickList
+     * @return
+     */
+    int batchSaveOrUpdatePick(List<AcPick> pickList);
+
 }

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

@@ -601,4 +601,8 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
         throw new ServiceException(postageR.getMsg());
     }
 
+    @Override
+    public int batchSaveOrUpdatePick(List<AcPick> pickList) {
+        return baseMapper.batchSaveOrUpdatePick(pickList);
+    }
 }

bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/vo/AcPickMemberLogVO.java

@@ -8,11 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * @Description: 会员提货日志
+ * 会员提货日志
- * @Author: jiang chao
- * @Time: 2023/5/15 14:00
- * @Classname: AcPickMemberLogVO
- * @PackageName: com.hzs.activity.pick.vo
  */
 @Data
 public class AcPickMemberLogVO {

bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hzs.activity.pick.service.IAcPickService;
 import com.hzs.common.core.constant.*;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.*;
@@ -11,6 +12,7 @@ import com.hzs.common.core.enums.retail.ERetailWaresPrice;
 import com.hzs.common.core.exception.ServiceException;
 import com.hzs.common.core.service.RedisService;
 import com.hzs.common.core.utils.*;
+import com.hzs.common.domain.activity.pick.AcPick;
 import com.hzs.common.domain.member.account.CuMemberAccount;
 import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.domain.member.ext.CuMemberAccountExt;
@@ -79,6 +81,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
     private ISaOrderTempService iSaOrderTempService;
     @Autowired
     private ISaOrderWaresLimitService iSaOrderWaresLimitService;
+    @Autowired
+    private IAcPickService iAcPickService;
 
     @Autowired
     private RedisService redisService;
@@ -217,6 +221,19 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
                     cuMember.setPkAwards(newGrade.getPkAwards());
                 }
             }
+
+            // TODO 2025.08.04 注册、升级专区，下单支付会员如果是分公司，订单不需要发货，直接放入提货中心
+            CuMember createMember = orderParam.getCreatorMember();
+            if (null == createMember) {
+                createMember = iMemberServiceApi.getMember(orderParam.getPkCreator()).getData();
+            }
+            Integer createPkGrade = createMember.getPkSettleGrade();
+            BdGrade createGrade = gradeList.stream().filter(tmpData -> tmpData.getPkId().equals(createPkGrade)).findFirst().get();
+            if (EGrade.BRANCH_COMPANY.getValue() == createGrade.getGradeValue()) {
+                // 发货方式：提货中心
+                saOrderExt.setDeliveryWay(EDelivery.PICK.getValue());
+            }
+
         }
 
         return saOrderExt;
@@ -661,6 +678,10 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
             saOrderItems.setOrderStatus(EOrderStatus.PAY.getValue());
             saOrderItems.setPkCreator(saOrderExt.getPkCreator());
             saOrderItems.setCreationTime(saOrderExt.getCreationTime());
+            if (EDelivery.PICK.getValue() == saOrderExt.getDeliveryWay()) {
+                // 主订单是提货中心，明细状态也是提货中心
+                saOrderItems.setOrderStatus(EOrderStatus.PICK.getValue());
+            }
 
             // 指定商品拆分 并且 非赠品
             if (boxWaresList.contains(saOrderItems.getWareCode())
@@ -699,8 +720,30 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
                         .build());
             }
         }
-        if (ESpecialArea.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()
+        if (ESpecialArea.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType()
+                || ESpecialArea.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) {
+            // 注册、升级
+            if (EDelivery.PICK.getValue() == saOrderExt.getDeliveryWay()) {
+                // 2025.08.04 分公司，注册、升级订单，全部进入提货中心
+                List<AcPick> pickList = new ArrayList<>();
+                for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) {
+                    AcPick acPick = AcPick.builder()
+                            .pkMember(saOrderExt.getPkCreator())
+                            .pickType(EPickType.COMPANY_PRODUCT.getValue())
+                            .pkDataId(saOrderItems.getPkProduct().longValue())
+                            .specsName(saOrderItems.getSpecsName())
+                            .specsNameId(saOrderItems.getSpecsNameId())
+                            .usableQuantity(saOrderItems.getQuantity())
+                            .baseQuantity(RetailConstants.PICK_BASE)
+                            .build();
+                    acPick.setPkCreator(saOrderExt.getPkCreator());
+                    pickList.add(acPick);
+                }
+                iAcPickService.batchSaveOrUpdatePick(pickList);
+            }
+        } else if (ESpecialArea.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()
                 || ESpecialArea.RETAIL_RESCISSION.getValue() == saOrderExt.getOrderType()) {
+            // 复购、重消
             if (waresLimitMap.size() > 0) {
                 String limitDate = DateUtils.parseDateToFormat(DateUtils.YYYYMM, new Date());
                 for (Integer key : waresLimitMap.keySet()) {

bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/vo/RetailQueryOrderVO.java

@@ -9,16 +9,11 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * @Description: 新零售查询订单返回VO
+ * 新零售查询订单返回VO
- * @Author: jiang chao
- * @Time: 2024/12/13 10:50
- * @Classname: RetailQueryOrderVO
- * @PackageName: com.hzs.retail.sale.vo
  */
 @Builder
 @AllArgsConstructor

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java

@@ -36,7 +36,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 发货清单立即发货控制器
@@ -135,7 +134,7 @@ public class SaDeliverController extends BaseController {
             Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData();
 
             // 获取需要翻译的枚举翻译
-            Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDeliveryStatus.values(), EDelivery.values(),
+            Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDeliveryStatus.values(),
                     ESupplyWay.values(), ETransportType.values(), EOrderType.values(), EDealerYesNo.values(), EShippingChannel.values());
 
             for (DeliverVO deliver : resultList) {
@@ -143,7 +142,7 @@ public class SaDeliverController extends BaseController {
                 OrderUtil.handleOrderAddress(areaMap, deliver);
 
                 deliver.setDeliverStatusVal(transactionMap.get(EnumsPrefixConstants.DELIVERY_STATUS + deliver.getDeliverStatus()));
-                deliver.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliver.getDeliveryWay()));
+                deliver.setDeliveryWayVal(EDelivery.getLabelByValue(deliver.getDeliveryWay()));
                 deliver.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliver.getOperateScope()));
                 deliver.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliver.getOrderType()));
                 deliver.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliver.getTranType()));

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java

@@ -133,7 +133,7 @@ public class SaDeliverHandledController extends BaseController {
             Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData();
 
             // 获取需要翻译的枚举翻译
-            Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), EOrderStatus.values(),
+            Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(
                     EOrderType.values(), EDeliveryStatus.values(), ESupplyWay.values(), ETransportType.values(), EPresaleStatus.values(),
                     EPrintStatus.values(), EShippingChannel.values());
 
@@ -141,9 +141,9 @@ public class SaDeliverHandledController extends BaseController {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliverHandled);
 
-                deliverHandled.setOrderStatusVal(transactionMap.get(EnumsPrefixConstants.ORDER_STATUS + deliverHandled.getOrderStatus()));
+                deliverHandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverHandled.getOrderStatus()));
                 deliverHandled.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliverHandled.getOrderType()));
-                deliverHandled.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliverHandled.getDeliveryWay()));
+                deliverHandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverHandled.getDeliveryWay()));
                 deliverHandled.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliverHandled.getOperateScope()));
                 deliverHandled.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + deliverHandled.getPreSaleStatus()));
                 deliverHandled.setPrintStatusVal(transactionMap.get(EnumsPrefixConstants.E_PRINT_STATUS + deliverHandled.getPrintStatus()));

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java

@@ -50,11 +50,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * @Description: 发货清单未合单控制器
+ * 发货清单未合单控制器
- * @Author: jiang chao
- * @Time: 2022/10/28 11:24
- * @Classname: SaDeliverOrderController
- * @PackageName: com.hzs.sale.deliver.controller.manage
  */
 @RestController
 @RequestMapping("/manage/deliver-unhandled")
@@ -189,20 +185,21 @@ public class SaDeliverUnhandledController extends BaseController {
             Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData();
 
             // 获取需要翻译的枚举翻译
-            Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values(), ETransportType.values(), EPresaleStatus.values(), EOrderType.values(), EOrderStatus.values(), ESaleType.values(), EShippingChannel.values());
+            Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ESupplyWay.values(),
+                    ETransportType.values(), EPresaleStatus.values(), EOrderType.values(), ESaleType.values(), EShippingChannel.values());
 
             for (DeliverUnhandledVO deliverUnhandled : resultList) {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliverUnhandled);
 
                 deliverUnhandled.setIsGiftVal(transactionMap.get(EnumsPrefixConstants.E_SALE_TYPE + deliverUnhandled.getIsGift()));
-                deliverUnhandled.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliverUnhandled.getDeliveryWay()));
+                deliverUnhandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverUnhandled.getDeliveryWay()));
                 deliverUnhandled.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliverUnhandled.getOperateScope()));
                 deliverUnhandled.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliverUnhandled.getShippingChannel()));
                 deliverUnhandled.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliverUnhandled.getTranType()));
                 deliverUnhandled.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + deliverUnhandled.getPreSaleStatus()));
                 deliverUnhandled.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliverUnhandled.getOrderType()));
-                deliverUnhandled.setOrderStatusVal(transactionMap.get(EnumsPrefixConstants.ORDER_STATUS + deliverUnhandled.getOrderStatus()));
+                deliverUnhandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverUnhandled.getOrderStatus()));
             }
         }
         ExcelUtil<DeliverUnhandledVO> util = new ExcelUtil<>(DeliverUnhandledVO.class);

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

@@ -666,6 +666,7 @@ public class ApiOrderController extends BaseController {
                             }
                             myOrder.setAddress(saOrder.getRecAddress());
                             myOrder.setOrderTypeVal(EOrderType.getEnumLabelByValue(myOrder.getOrderType()));
+                            myOrder.setOrderStatusVal(EOrderStatus.getLabelByValue(saOrderItems.getOrderStatus()));
 
                             // 处理订单明细
                             myOrderItemsList = new ArrayList<>();

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

@@ -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;
@@ -32,7 +31,6 @@ import com.hzs.member.account.dto.BusinessCommissionDTO;
 import com.hzs.member.account.dto.MemberAmountDTO;
 import com.hzs.member.account.dto.MemberBalanceDTO;
 import com.hzs.member.base.IMemberServiceApi;
-import com.hzs.sale.deliver.service.ISaDeliverItemsService;
 import com.hzs.sale.deliver.vo.SelfDataBarCodeVO;
 import com.hzs.sale.deliver.vo.SelfDataProductVO;
 import com.hzs.sale.deliver.vo.SelfDataVO;
@@ -43,7 +41,6 @@ import com.hzs.sale.order.service.IOrderBusinessService;
 import com.hzs.sale.order.service.ISaOrderSelfLogService;
 import com.hzs.sale.order.service.ISaOrderService;
 import com.hzs.sale.order.vo.*;
-import com.hzs.sale.product.IProductServiceApi;
 import com.hzs.sale.util.OrderUtil;
 import com.hzs.system.base.IAreaServiceApi;
 import com.hzs.system.base.ICurrencyServiceApi;
@@ -78,7 +75,7 @@ public class SaOrderBusinessController extends BaseController {
     @Autowired
     private IOrderBusinessService iOrderBusinessService;
     @Autowired
-    private ISaOrderSelfLogService saOrderSelfLogService;
+    private ISaOrderSelfLogService iSaOrderSelfLogService;
 
     @Autowired
     private UserTokenService userTokenService;
@@ -88,8 +85,6 @@ public class SaOrderBusinessController extends BaseController {
     @DubboReference
     IBusinessCommission iBusinessCommission;
     @DubboReference
-    IProductServiceApi productServiceApi;
-    @DubboReference
     IUserServiceApi iUserServiceApi;
     @DubboReference
     IMemberServiceApi iMemberServiceApi;
@@ -100,12 +95,6 @@ public class SaOrderBusinessController extends BaseController {
     @DubboReference
     ISystemConfigServiceApi systemConfigServiceApi;
 
-    private ISaDeliverItemsService saDeliverItemsService;
-
-    @Autowired
-    public void setSaDeliverItemsService(ISaDeliverItemsService saDeliverItemsService) {
-        this.saDeliverItemsService = saDeliverItemsService;
-    }
 
     /**
      * 订单业务列表
@@ -1059,7 +1048,7 @@ public class SaOrderBusinessController extends BaseController {
         if (selfPickUpParam.getEndDate() != null) {
             selfPickUpParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, selfPickUpParam.getEndDate()));
         }
-        List<SaOrderSelfLogExt> orderSelfLogList = saOrderSelfLogService.querySaOrderSelfLog(selfPickUpParam);
+        List<SaOrderSelfLogExt> orderSelfLogList = iSaOrderSelfLogService.querySaOrderSelfLog(selfPickUpParam);
         return getDataTable(orderSelfLogList);
     }
 
@@ -1080,7 +1069,7 @@ public class SaOrderBusinessController extends BaseController {
             }
         }
 
-        SaOrderSelfLog saOrderSelfLog = saOrderSelfLogService.querySaOrderSelfLogById(selfPickUpParam.getPkId());
+        SaOrderSelfLog saOrderSelfLog = iSaOrderSelfLogService.querySaOrderSelfLogById(selfPickUpParam.getPkId());
         if (saOrderSelfLog == null || selfPickUpParam.getApproveStatus() <= saOrderSelfLog.getApproveStatus()) {
             return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY));
         }
@@ -1098,7 +1087,7 @@ public class SaOrderBusinessController extends BaseController {
                 return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_CURRENT_DATE));
             }
             selfPickUpParam.setPkCreator(SecurityUtils.getUserId());
-            saOrderSelfLogService.updateSaOrderSelfLog(selfPickUpParam, selfPickUpParam.getPkId());
+            iSaOrderSelfLogService.updateSaOrderSelfLog(selfPickUpParam, selfPickUpParam.getPkId());
             return AjaxResult.success(selfPickUpParam);
         }
     }
@@ -1114,7 +1103,7 @@ public class SaOrderBusinessController extends BaseController {
         if (selfPickUpParam.getPkId() == null) {
             return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY));
         }
-        SaOrderSelfLog saOrderSelfLog = saOrderSelfLogService.querySaOrderSelfLogById(selfPickUpParam.getPkId());
+        SaOrderSelfLog saOrderSelfLog = iSaOrderSelfLogService.querySaOrderSelfLogById(selfPickUpParam.getPkId());
         if (saOrderSelfLog == null || EApproveRechargeStatus.WAIT.getValue() != saOrderSelfLog.getApproveStatus()) {
             return AjaxResult.error(TransactionUtils.getContent(SaOrderMsgConstants.ORDER_EMPTY));
         }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderChargeLogController.java

@@ -34,27 +34,19 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-/**
- * @BelongsProject: hzs_cloud
- * @BelongsPackage: com.hzs.sale.order.controller.manage
- * @Author: yh
- * @CreateTime: 2023-04-11  10:22
- * @Description:
- * @Version: 1.0
- */
 @RestController
 @RequestMapping("/manage/order-charge-log")
 public class SaOrderChargeLogController extends BaseController {
 
     @Autowired
-    private ITransactionCommonService transactionCommonService;
+    private ITransactionCommonService iTransactionCommonService;
     @Autowired
-    private ISaOrderChargeLogService orderChargeLogService;
+    private ISaOrderChargeLogService iSaOrderChargeLogService;
 
     @DubboReference
-    IVertexServiceApi vertexServiceApi;
+    IVertexServiceApi iVertexServiceApi;
     @DubboReference
-    IAreaServiceApi areaServiceApi;
+    IAreaServiceApi iAreaServiceApi;
 
     /**
      * 撤单信息列表
@@ -96,18 +88,18 @@ public class SaOrderChargeLogController extends BaseController {
         }
 
         startPage();
-        List<SaOrderChargeLogExt> list = orderChargeLogService.cancellationList(orderChargeLogParam);
+        List<SaOrderChargeLogExt> list = iSaOrderChargeLogService.cancellationList(orderChargeLogParam);
         List<OrderChargeLogVo> resultList = new ArrayList<>();
 
         if (CollectionUtil.isNotEmpty(list)) {
             // 地区
-            R<Map<Integer, String>> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
+            R<Map<Integer, String>> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
             // 体系
-            R<List<VertexDTO>> vertexAll = vertexServiceApi.findAll();
+            R<List<VertexDTO>> vertexAll = iVertexServiceApi.findAll();
             Map<Long, VertexDTO> vertexMap = vertexAll.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity()));
 
-            Map<String, String> transactionMap = transactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values(), EPresaleStatus.values(),
+            Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values(), EPresaleStatus.values(),
-                    ESupplyWay.values(), EDelivery.values(), EOrderStatus.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(),
+                    ESupplyWay.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(),
                     EOrderType.values(), ETransportType.values(), EYesNo.values(), EShippingChannel.values(), EUnit.values(), ESignSource.values(), EOrderSource.values());
 
             for (SaOrderChargeLogExt orderChargeLogExt : list) {
@@ -187,7 +179,7 @@ public class SaOrderChargeLogController extends BaseController {
                 // 订单总额(美金)
                 orderChargeLogVo.setOrderTotalAmountDollar(orderChargeLogExt.getOrderAmount().multiply(orderChargeLogExt.getInExchangeRate()));
                 // 订单状态
-                orderChargeLogVo.setOrderStatusStr(transactionMap.get(EOrderStatus.getEOrderStatus(orderChargeLogExt.getOrderStatus()).getKey()));
+                orderChargeLogVo.setOrderStatusStr(EOrderStatus.getLabelByValue(orderChargeLogExt.getOrderStatus()));
                 //物流单号
                 orderChargeLogVo.setLogisticsCodes(orderChargeLogExt.getLogisticsCode());
                 // 物流公司
@@ -195,9 +187,7 @@ public class SaOrderChargeLogController extends BaseController {
                 // 发货时间
                 orderChargeLogVo.setDeliveryTime(orderChargeLogExt.getDeliveryTime());
                 // 发货方式
-                if (orderChargeLogExt.getDeliveryWay() != null) {
+                orderChargeLogVo.setDeliveryWayStr(EDelivery.getLabelByValue(orderChargeLogExt.getDeliveryWay()));
-                    orderChargeLogVo.setDeliveryWayStr(transactionMap.get(EDelivery.getDelivery(orderChargeLogExt.getDeliveryWay()).getKey()));
-                }
                 //销售方式
                 if (orderChargeLogExt.getOperateScope() != null && ESupplyWay.getESupplyWay(orderChargeLogExt.getOperateScope()) != null) {
                     orderChargeLogVo.setOperateScopeStr(transactionMap.get(ESupplyWay.getESupplyWay(orderChargeLogExt.getOperateScope()).getKey()));
@@ -278,18 +268,18 @@ public class SaOrderChargeLogController extends BaseController {
             orderChargeLogParam.setEndCancelOrderTime(DateUtils.getEndTime(orderChargeLogParam.getEndCancelOrderTime()));
         }
 
-        List<SaOrderChargeLogExt> list = orderChargeLogService.cancellationList(orderChargeLogParam);
+        List<SaOrderChargeLogExt> list = iSaOrderChargeLogService.cancellationList(orderChargeLogParam);
         List<OrderChargeLogVo> resultList = new ArrayList<>();
 
         if (CollectionUtil.isNotEmpty(list)) {
             // 地区
-            R<Map<Integer, String>> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
+            R<Map<Integer, String>> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
             // 体系
-            R<List<VertexDTO>> vertexAll = vertexServiceApi.findAll();
+            R<List<VertexDTO>> vertexAll = iVertexServiceApi.findAll();
             Map<Long, VertexDTO> vertexMap = vertexAll.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity()));
 
-            Map<String, String> transactionMap = transactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values(), EPresaleStatus.values(),
+            Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values(), EPresaleStatus.values(),
-                    ESupplyWay.values(), EDelivery.values(), EOrderStatus.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(),
+                    ESupplyWay.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(),
                     EOrderType.values(), ETransportType.values(), EYesNo.values(), EShippingChannel.values(), EUnit.values(), ESignSource.values(), EOrderSource.values());
 
             for (SaOrderChargeLogExt orderChargeLogExt : list) {
@@ -369,7 +359,7 @@ public class SaOrderChargeLogController extends BaseController {
                 orderChargeLogVo.setPostageDollar(orderChargeLogExt.getPostage().divide(orderChargeLogExt.getInExchangeRate(), 2, BigDecimal.ROUND_HALF_UP));
                 orderChargeLogVo.setOrderTotalAmountDollar(orderChargeLogVo.getOrderAmountDollar());
                 // 订单状态
-                orderChargeLogVo.setOrderStatusStr(transactionMap.get(EOrderStatus.getEOrderStatus(orderChargeLogExt.getOrderStatus()).getKey()));
+                orderChargeLogVo.setOrderStatusStr(EOrderStatus.getLabelByValue(orderChargeLogExt.getOrderStatus()));
                 //物流单号
                 orderChargeLogVo.setLogisticsCodes(orderChargeLogExt.getLogisticsCode());
                 // 物流公司
@@ -377,9 +367,7 @@ public class SaOrderChargeLogController extends BaseController {
                 // 发货时间
                 orderChargeLogVo.setDeliveryTime(orderChargeLogExt.getDeliveryTime());
                 // 发货方式
-                if (orderChargeLogExt.getDeliveryWay() != null) {
+                orderChargeLogVo.setDeliveryWayStr(EDelivery.getLabelByValue(orderChargeLogExt.getDeliveryWay()));
-                    orderChargeLogVo.setDeliveryWayStr(transactionMap.get(EDelivery.getDelivery(orderChargeLogExt.getDeliveryWay()).getKey()));
-                }
                 //销售方式
                 if (orderChargeLogExt.getOperateScope() != null && ESupplyWay.getESupplyWay(orderChargeLogExt.getOperateScope()) != null) {
                     orderChargeLogVo.setOperateScopeStr(transactionMap.get(ESupplyWay.getESupplyWay(orderChargeLogExt.getOperateScope()).getKey()));

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java

@@ -41,12 +41,6 @@ import java.util.stream.Collectors;
 
 /**
  * 订单控制类
- *
- * @author: sui q
- * @time: 2022/8/27 16:20
- * @description:
- * @classname: OrderController
- * @package_name: com.hzs.sale.order.controller
  */
 @RestController
 @RequestMapping("/manage/order")
@@ -56,14 +50,14 @@ public class SaOrderController extends ParentOrderController {
     @Autowired
     private ITransactionCommonService iTransactionCommonService;
     @Autowired
-    private ISaOrderService orderService;
+    private ISaOrderService iSaOrderService;
     @Autowired
-    private ISaOrderItemsService orderItemsService;
+    private ISaOrderItemsService iSaOrderItemsService;
     @Autowired
-    private ISaOrderRemarksService orderRemarksService;
+    private ISaOrderRemarksService iSaOrderRemarksService;
 
     @DubboReference
-    IAreaServiceApi areaServiceApi;
+    IAreaServiceApi iAreaServiceApi;
     @DubboReference
     IUserServiceApi iUserServiceApi;
     @DubboReference
@@ -90,7 +84,7 @@ public class SaOrderController extends ParentOrderController {
         if (waresOrderParam.getEndPayDate() != null) {
             waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate()));
         }
-        Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
+        Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
         waresOrderParam.setPkCountry(SecurityUtils.getPkCountry());
         waresOrderParam.setSystemType(SecurityUtils.getSystemType());
 
@@ -101,7 +95,7 @@ public class SaOrderController extends ParentOrderController {
         waresOrderParam.setTeamList(userAuthorityDTO.getUserTeamList());
 
         startPage();
-        List<WaresOrderVo> resultList = orderService.selectByOrderInfoList(waresOrderParam);
+        List<WaresOrderVo> resultList = iSaOrderService.selectByOrderInfoList(waresOrderParam);
 
         for (WaresOrderVo waresOrderVo : resultList) {
             // 省
@@ -132,12 +126,7 @@ public class SaOrderController extends ParentOrderController {
                 waresOrderVo.setPreSaleStatusStr(EPresaleStatus.getEPresaleStatus(waresOrderVo.getPreSaleStatus()).getLabel());
             }
             // 订单状态
-            if (waresOrderVo.getOrderStatus() != null) {
+            waresOrderVo.setOrderStatusStr(EOrderStatus.getLabelByValue(waresOrderVo.getOrderStatus()));
-                EOrderStatus orderStatusEnum = EOrderStatus.getEOrderStatus(waresOrderVo.getOrderStatus());
-                if (orderStatusEnum != null) {
-                    waresOrderVo.setOrderStatusStr(orderStatusEnum.getLabel());
-                }
-            }
             // 支付方式
             if (waresOrderVo.getPayType() != null) {
                 EOrderPayType eOrderPayType = EOrderPayType.getEnumByValue(waresOrderVo.getPayType());
@@ -183,7 +172,7 @@ public class SaOrderController extends ParentOrderController {
         if (waresOrderParam.getEndPayDate() != null) {
             waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate()));
         }
-        Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
+        Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
         waresOrderParam.setPkCountry(SecurityUtils.getPkCountry());
         waresOrderParam.setSystemType(SecurityUtils.getSystemType());
 
@@ -193,9 +182,9 @@ public class SaOrderController extends ParentOrderController {
         waresOrderParam.setVertexIdList(userAuthorityDTO.getVertexIdList());
         waresOrderParam.setTeamList(userAuthorityDTO.getUserTeamList());
         // startPage();
-        List<WaresOrderVo> resultList = orderService.selectByOrderInfoList(waresOrderParam);
+        List<WaresOrderVo> resultList = iSaOrderService.selectByOrderInfoList(waresOrderParam);
         // 获取需要翻译的枚举翻译
-        Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values(), ETransportType.values(), EPresaleStatus.values(), EOrderType.values(), EOrderStatus.values(), EOrderPayType.values(), ESaleType.values(), EShippingChannel.values());
+        Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ESupplyWay.values(), ETransportType.values(), EPresaleStatus.values(), EOrderType.values(), EOrderPayType.values(), ESaleType.values(), EShippingChannel.values());
         for (WaresOrderVo waresOrderVo : resultList) {
             // 省
             if (waresOrderVo.getRecProvince() != null) {
@@ -220,12 +209,7 @@ public class SaOrderController extends ParentOrderController {
                 waresOrderVo.setPreSaleStatusStr(EPresaleStatus.getEPresaleStatus(waresOrderVo.getPreSaleStatus()).getLabel());
             }
             // 订单状态
-            if (waresOrderVo.getOrderStatus() != null) {
+            waresOrderVo.setOrderStatusStr(EOrderStatus.getLabelByValue(waresOrderVo.getOrderStatus()));
-                EOrderStatus orderStatusEnum = EOrderStatus.getEOrderStatus(waresOrderVo.getOrderStatus());
-                if (orderStatusEnum != null) {
-                    waresOrderVo.setOrderStatusStr(orderStatusEnum.getLabel());
-                }
-            }
             // 支付方式
             if (waresOrderVo.getPayType() != null) {
                 waresOrderVo.setPayTypeStr(EOrderPayType.getEnumByValue(waresOrderVo.getPayType()).getLabel());
@@ -271,11 +255,9 @@ public class SaOrderController extends ParentOrderController {
         }
 
         startPage();
-        List<WaresOrderVo> resultList = orderItemsService.selectByInvestmentList(waresOrderParam);
+        List<WaresOrderVo> resultList = iSaOrderItemsService.selectByInvestmentList(waresOrderParam);
 
-        // 获取需要翻译的枚举翻译
+        Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
-        Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values());
-        Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
         for (WaresOrderVo waresOrderVo : resultList) {
             // 省
             if (waresOrderVo.getRecProvince() != null) {
@@ -290,9 +272,7 @@ public class SaOrderController extends ParentOrderController {
                 waresOrderVo.setRecCountryName(areaMap.get(waresOrderVo.getRecCountry()));
             }
             // 发货方式
-            if (null != waresOrderVo.getDeliveryWay()) {
+            waresOrderVo.setDeliveryWayStr(EDelivery.getLabelByValue(waresOrderVo.getDeliveryWay()));
-                waresOrderVo.setDeliveryWayStr(transactionMap.get(EnumsPrefixConstants.DELIVERY + waresOrderVo.getDeliveryWay()));
-            }
             // 运输方式
             if (waresOrderVo.getTranType() != null) {
                 waresOrderVo.setTranTypeStr(ETransportType.getETransportType(waresOrderVo.getTranType()).getLabel());
@@ -302,9 +282,7 @@ public class SaOrderController extends ParentOrderController {
                 waresOrderVo.setPreSaleStatusStr(EPresaleStatus.getEPresaleStatus(waresOrderVo.getPreSaleStatus()).getLabel());
             }
             // 订单状态
-            if (waresOrderVo.getOrderStatus() != null) {
+            waresOrderVo.setOrderStatusStr(EOrderStatus.getLabelByValue(waresOrderVo.getOrderStatus()));
-                waresOrderVo.setOrderStatusStr(EOrderStatus.getEOrderStatus(waresOrderVo.getOrderStatus()).getLabel());
-            }
             // 支付方式
             if (waresOrderVo.getPayType() != null) {
                 waresOrderVo.setPayTypeStr(EOrderPayType.getEnumByValue(waresOrderVo.getPayType()).getLabel());
@@ -357,11 +335,9 @@ public class SaOrderController extends ParentOrderController {
             waresOrderParam.setEndCreateDate(DateUtils.getEndTime(waresOrderParam.getEndCreateDate()));
         }
 
-        List<WaresOrderVo> resultList = orderItemsService.selectByInvestmentList(waresOrderParam);
+        List<WaresOrderVo> resultList = iSaOrderItemsService.selectByInvestmentList(waresOrderParam);
 
-        Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
+        Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
-        // 获取需要翻译的枚举翻译
-        Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values());
 
         for (WaresOrderVo waresOrderVo : resultList) {
             // 省
@@ -377,9 +353,7 @@ public class SaOrderController extends ParentOrderController {
                 waresOrderVo.setRecCountryName(areaMap.get(waresOrderVo.getRecCountry()));
             }
             // 发货方式
-            if (waresOrderVo.getDeliveryWay() != null) {
+            waresOrderVo.setDeliveryWayStr(EDelivery.getLabelByValue(waresOrderVo.getDeliveryWay()));
-                waresOrderVo.setDeliveryWayStr(transactionMap.get(EnumsPrefixConstants.DELIVERY + waresOrderVo.getDeliveryWay()));
-            }
 
             // 运输方式
             if (waresOrderVo.getTranType() != null) {
@@ -397,12 +371,7 @@ public class SaOrderController extends ParentOrderController {
                 }
             }
             // 订单状态
-            if (waresOrderVo.getOrderStatus() != null) {
+            waresOrderVo.setOrderStatusStr(EOrderStatus.getLabelByValue(waresOrderVo.getOrderStatus()));
-                EOrderStatus orderStatus = EOrderStatus.getEOrderStatus(waresOrderVo.getOrderStatus());
-                if (orderStatus != null) {
-                    waresOrderVo.setOrderStatusStr(orderStatus.getLabel());
-                }
-            }
             // 支付方式
             if (waresOrderVo.getPayType() != null) {
                 EOrderPayType orderPayType = EOrderPayType.getEnumByValue(waresOrderVo.getPayType());
@@ -498,11 +467,11 @@ public class SaOrderController extends ParentOrderController {
      * @param param
      */
     private void handleOrderSelect(List<OrderSelectVO> resultList, OrderSelectParam param) {
-        List<SaOrderItemsExt> saOrderItemsExtList = orderService.queryOrderSelect(param, SecurityUtils.getPkCountry());
+        List<SaOrderItemsExt> saOrderItemsExtList = iSaOrderService.queryOrderSelect(param, SecurityUtils.getPkCountry());
 
         if (CollectionUtil.isNotEmpty(saOrderItemsExtList)) {
             // 调用system服务，获取地址
-            Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
+            Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
 
             for (SaOrderItemsExt saOrderItemsExt : saOrderItemsExtList) {
                 OrderSelectVO orderSelectVO = BeanUtil.copyProperties(saOrderItemsExt, OrderSelectVO.class);
@@ -518,18 +487,18 @@ public class SaOrderController extends ParentOrderController {
      */
     @PostMapping("/update-order-remarks")
     public AjaxResult updateOrderRemarks(@RequestBody SaOrderRemarks saOrderRemarks) {
-        SaOrderRemarks orderRemarks = orderRemarksService.getOne(new LambdaQueryWrapper<SaOrderRemarks>().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder()));
+        SaOrderRemarks orderRemarks = iSaOrderRemarksService.getOne(new LambdaQueryWrapper<SaOrderRemarks>().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder()));
         if (orderRemarks == null) {
             saOrderRemarks.setCreationTime(DateUtils.currentDateTime());
             saOrderRemarks.setPkCountry(SecurityUtils.getPkCountry());
             saOrderRemarks.setPkCreator(SecurityUtils.getUserId());
             saOrderRemarks.setStatus(EYesNo.NO.getIntValue());
-            orderRemarksService.save(saOrderRemarks);
+            iSaOrderRemarksService.save(saOrderRemarks);
         } else {
             orderRemarks.setModifiedTime(DateUtils.currentDateTime());
             orderRemarks.setPkModified(SecurityUtils.getUserId());
             orderRemarks.setRemarks(saOrderRemarks.getRemarks());
-            orderRemarksService.update(orderRemarks, new LambdaQueryWrapper<SaOrderRemarks>().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder()));
+            iSaOrderRemarksService.update(orderRemarks, new LambdaQueryWrapper<SaOrderRemarks>().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder()));
         }
         return AjaxResult.success();
     }
@@ -565,7 +534,7 @@ public class SaOrderController extends ParentOrderController {
             singleItemStatParam.setEndPayDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.getEndTime(DateUtils.addDate(nowDate, 1))));
         }
         startPage();
-        List<SingleItemStatVo> singleItemStatList = orderService.singleItemStat(singleItemStatParam);
+        List<SingleItemStatVo> singleItemStatList = iSaOrderService.singleItemStat(singleItemStatParam);
         for (SingleItemStatVo singleItemStat : singleItemStatList) {
             singleItemStat.setTotal(singleItemStat.getGiftQuantity() + singleItemStat.getProductQuantity());
         }
@@ -614,7 +583,7 @@ public class SaOrderController extends ParentOrderController {
         // 总计
         Integer total = 0;
         // 查询计算总计
-        List<SingleItemStatVo> siList = orderService.singleItemStat(singleItemStatParam);
+        List<SingleItemStatVo> siList = iSaOrderService.singleItemStat(singleItemStatParam);
         for (SingleItemStatVo singleItemStatVo : siList) {
             singleItemStatVo.setTotal(singleItemStatVo.getGiftQuantity() + singleItemStatVo.getProductQuantity());
             waresQuantity += singleItemStatVo.getWaresQuantity();
@@ -665,7 +634,7 @@ public class SaOrderController extends ParentOrderController {
             singleItemStatParam.setEndPayDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.getEndTime(DateUtils.addDate(nowDate, 1))));
         }
 
-        List<SingleItemStatVo> singleItemStatList = orderService.singleItemStat(singleItemStatParam);
+        List<SingleItemStatVo> singleItemStatList = iSaOrderService.singleItemStat(singleItemStatParam);
 
         int waresQuantity = 0;
         // 产品数量
@@ -728,9 +697,9 @@ public class SaOrderController extends ParentOrderController {
         param.setTeamList(userAuthorityDTO.getUserTeamList());
 
         startPage();
-        List<OrderInvoicingVO> resultList = orderService.listOrderInvoicing(param);
+        List<OrderInvoicingVO> resultList = iSaOrderService.listOrderInvoicing(param);
 
-        Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
+        Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
         for (OrderInvoicingVO vo : resultList) {
             // 地区处理
             if (vo.getRecProvince() != null) {

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.activity.pick.service.IAcPickService;
 import com.hzs.activity.pick.service.IAcRetailPickService;
 import com.hzs.common.core.constant.*;
 import com.hzs.common.core.constant.msg.ConfigMsgConstants;
@@ -137,8 +138,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
     @Autowired
     private IBdProductExtendService iBdProductExtendService;
     @Autowired
-    private RabbitTemplate rabbitTemplate;
-    @Autowired
     private IBdWaresSpecsRelationService waresSpecsRelationService;
     @Autowired
     private ISaDeliverItemsService saDeliverItemsService;
@@ -146,13 +145,17 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
     private IAcRetailPickService iAcRetailPickService;
     @Autowired
     private ISaOrderWaresLimitService iSaOrderWaresLimitService;
+    @Autowired
+    private IAcPickService iAcPickService;
 
     @Autowired
-    private IOrderBusinessService orderBusinessService;
+    private IOrderBusinessService iOrderBusinessService;
     @Autowired
-    private ISaOrderChargeLogService saOrderChargeLogService;
+    private ISaOrderChargeLogService iSaOrderChargeLogService;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
 
     @Override
     public List<CuMemberExt> queryMemberExtByCondition(CuMember cuMember) {
@@ -1262,7 +1265,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
 //            if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
 //                approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
 //            }
-            Map<Long, OrderQueryChargeDTO> queryChargeMap = orderBusinessService.queryChargeLog(Collections.singletonList(validateCancelOrderVO.getSaOrderExt()),
+            Map<Long, OrderQueryChargeDTO> queryChargeMap = iOrderBusinessService.queryChargeLog(Collections.singletonList(validateCancelOrderVO.getSaOrderExt()),
                     approveBusiness, orderCancelParam.getPkCountry());
             if (queryChargeMap != null && queryChargeMap.containsKey(saOrderExt.getPkId())) {
                 List<MemberAmountDTO> memberAmountDTOList = new ArrayList<>();
@@ -1343,6 +1346,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             throw new ServiceException("更新订单失败");
         }
 
+        // 2025.08.04 分公司下的注册、升级订单不直接发货，进入提货中心，撤单需要单独处理提货中心数据
+        this.handleCompanyProduct(saOrderExt, pkApprove);
+
         // 撤销注册订单 单点撤单
         if (ECancelOrderType.SINGLE_CANCEL_ORDER.getValue() == orderCancelParam.getCancelType()) {
             // 单点撤单，变死点
@@ -1804,6 +1810,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
                 throw new ServiceException("更新订单失败");
             }
 
+            // 2025.08.04 分公司下的注册、升级订单不直接发货，进入提货中心，撤单需要单独处理提货中心数据
+            this.handleCompanyProduct(saOrderExt, pkApprove);
+
             // 本批订单修改记录编号
             String businessCode = CommonUtil.createSerialNumber(EOrderPrefix.DEFAULT);
             SaOrderChargeLog saOrderChargeLog = this.packageSaOrderChargeLog(currentDate, pkApprove,
@@ -1814,7 +1823,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             mo.setPkCreator(pkApprove);
             saOrderChargeLog.setAfterData(JSONUtil.toJsonStr(mo));
             saOrderChargeLog.setSource(ESignSource.MEMBER.getValue());
-            saOrderChargeLogService.save(saOrderChargeLog);
+            iSaOrderChargeLogService.save(saOrderChargeLog);
 
             // 撤销注册订单
             if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue()) {
@@ -2244,4 +2253,23 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
         return baseMapper.getRegionBindNum(province, city, county);
     }
 
+    /**
+     * 分公司注册、升级提货中心处理
+     *
+     * @param saOrderExt
+     * @param pkMember
+     */
+    private void handleCompanyProduct(SaOrderExt saOrderExt, Long pkMember) {
+        if ((EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType()
+                || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType())
+                && EDelivery.PICK.getValue() == saOrderExt.getDeliveryWay()) {
+            for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsExtList()) {
+                if (iAcPickService.updatePickUsableByMemberAndActivityType(saOrderExt.getPkCreator(), EPickType.COMPANY_PRODUCT.getValue(),
+                        null, saOrderItems.getPkProduct().longValue(), saOrderItems.getQuantity(), pkMember) == 0) {
+                    throw new ServiceException("订单对应提货产品数量不足，不能撤单");
+                }
+            }
+        }
+    }
+
 }

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

@@ -19,11 +19,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: 我的订单返回VO
+ * 我的订单返回VO
- * @Author: jiang chao
- * @Time: 2023/1/13 16:13
- * @Classname: MyOrderVO
- * @PackageName: com.hzs.sale.order.vo
  */
 @NoArgsConstructor
 @AllArgsConstructor
@@ -105,7 +101,6 @@ public class MyOrderVO implements Serializable {
     /**
      * 订单状态（EOrderStatus）
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS)
     private Integer orderStatus;
     /**
      * 订单状态显示

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderSelfPickupVO.java

@@ -14,11 +14,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @description: 订单自提VO
+ * 订单自提VO
- * @author: zhang jing
- * @date: 2023/5/29 14:56
- * @param:
- * @return:
  **/
 @NoArgsConstructor
 @AllArgsConstructor

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/SaTOrderQueryVO.java

@@ -1,184 +0,0 @@
-package com.hzs.sale.order.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hzs.common.core.annotation.Excel;
-import com.hzs.common.core.annotation.Transaction;
-import com.hzs.common.core.constant.EnumsPrefixConstants;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Description: 查询商品订单VO
- * @Author: jiang chao
- * @Time: 2023/5/29 17:48
- * @Classname: SaTOrderQueryVO
- * @PackageName: com.hzs.sale.order.vo
- */
-@Data
-public class SaTOrderQueryVO {
-
-    /**
-     * 订单ID
-     */
-    private Long pkOrder;
-    /**
-     * 订单明细ID
-     */
-    private Long pkOrderItems;
-
-    /**
-     * 产品名称
-     */
-    @Excel(name = "产品名称")
-    private String productName;
-    /**
-     * 产品规格
-     */
-    @Excel(name = "产品规格")
-    private String specsName;
-    /**
-     * 产品单价
-     */
-    @Excel(name = "产品单价(¥)")
-    private BigDecimal price;
-    /**
-     * 产品业绩
-     */
-    @Excel(name = "产品业绩($)")
-    private BigDecimal achievement;
-
-    /**
-     * 订单状态 (0=待付款,1=已付款,2=已合单,3=待收货,4=已撤单,5=已收货)
-     */
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS)
-    private Integer orderStatus;
-    /**
-     * 订单状态显示
-     */
-    @Excel(name = "发货状态")
-    private String orderStatusVal;
-
-    /**
-     * 物流单号
-     */
-    @Excel(name = "物流单号")
-    private String logisticsCode;
-    /**
-     * 物流公司
-     */
-    @Excel(name = "物流公司")
-    private String logisticsCompany;
-    /**
-     * 产品数量
-     */
-    @Excel(name = "产品数量")
-    private Integer quantity;
-
-    /**
-     * 订单编号
-     */
-    @Excel(name = "订单编号")
-    private String orderCode;
-
-    /**
-     * 会员编号
-     */
-    @Excel(name = "会员编号")
-    private String memberCode;
-
-    /**
-     * 会员名称
-     */
-    @Excel(name = "会员姓名")
-    private String memberName;
-
-    /**
-     * 收货人
-     */
-    @Excel(name = "收货人")
-    private String recName;
-
-    /**
-     * 收货电话
-     */
-    @Excel(name = "联系方式")
-    private String recPhone;
-
-    /**
-     * 省
-     */
-    private Integer recProvince;
-    /**
-     * 省显示
-     */
-    @Excel(name = "省")
-    private String recProvinceVal;
-
-    /**
-     * 市
-     */
-    private Integer recCity;
-    /**
-     * 市显示
-     */
-    @Excel(name = "市")
-    private String recCityVal;
-
-    /**
-     * 县
-     */
-    private Integer recCounty;
-    /**
-     * 县显示
-     */
-    @Excel(name = "区/县")
-    private String recCountyVal;
-
-    /**
-     * 收货地址
-     */
-    @Excel(name = "详细地址")
-    private String recAddress;
-
-    /**
-     * 订单金额
-     */
-    @Excel(name = "订单金额(¥)")
-    private BigDecimal orderAmount;
-
-    /**
-     * 订单业绩
-     */
-    @Excel(name = "订单业绩($)")
-    private BigDecimal orderAchieve;
-
-    /**
-     * 邮费
-     */
-    @Excel(name = "邮费(¥)")
-    private BigDecimal postage;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String remark;
-
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date creationTime;
-
-    /**
-     * 支付时间
-     */
-    @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date payTime;
-
-
-}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java

@@ -52,22 +52,15 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-/**
- * @Description:
- * @Author: yuhui
- * @Time: 2022/9/8 17:04
- * @Classname: BdWaresController
- * @PackageName: com.hzs.sale.wares.controller.manage
- */
 @Slf4j
 @RestController
 @RequestMapping("/manage/wares")
 public class BdWaresController extends BaseController {
 
     @DubboReference
-    ICurrencyServiceApi currencyServiceApi;
+    ICurrencyServiceApi iCurrencyServiceApi;
     @DubboReference
-    IRangeServiceApi rangeServiceApi;
+    IRangeServiceApi iRangeServiceApi;
 
     @Autowired
     private IBdWaresAuthorizeService waresAuthorizeService;
@@ -84,11 +77,11 @@ public class BdWaresController extends BaseController {
     @Autowired
     private IBdWaresRangeService waresRangeService;
     @Autowired
-    private IBdProductService productService;
+    private IBdProductService iBdProductService;
     @Autowired
     private IBdWaresSpecsPackService waresSpecsPackService;
     @Autowired
-    private IBdWaresService waresService;
+    private IBdWaresService iBdWaresService;
     @Autowired
     private IBdWaresLabelService waresLabelService;
     @Autowired
@@ -121,12 +114,12 @@ public class BdWaresController extends BaseController {
         waresParams.setSystemType(SecurityUtils.getSystemType());
 
         startPage();
-        List<WaresVo> resultList = waresService.selectByWaresInfo(waresParams);
+        List<WaresVo> resultList = iBdWaresService.selectByWaresInfo(waresParams);
         if (CollectionUtil.isNotEmpty(resultList)) {
-            R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+            R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
 
             resultList.parallelStream().forEach(waresVo -> {
-                WaresAuthorityVo waresAuthorityVo = waresService.getWaresAuthorityFirst(waresVo.getPkWares());
+                WaresAuthorityVo waresAuthorityVo = iBdWaresService.getWaresAuthorityFirst(waresVo.getPkWares());
                 if (waresAuthorityVo != null) {
                     waresVo.setAuthorityType(waresAuthorityVo.getAuthorityType());
                     waresVo.setAuthorityTypeVal(EWaresPermissionType.getEnumByValue(waresAuthorityVo.getAuthorityType()).getLabel());
@@ -156,9 +149,9 @@ public class BdWaresController extends BaseController {
         waresParams.setPkCountry(SecurityUtils.getPkCountry());
         waresParams.setSystemType(SecurityUtils.getSystemType());
 
-        List<WaresVo> resultList = waresService.selectByWaresInfo(waresParams);
+        List<WaresVo> resultList = iBdWaresService.selectByWaresInfo(waresParams);
         if (CollectionUtil.isNotEmpty(resultList)) {
-            R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+            R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
             // 获取需要翻译的枚举翻译
             Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ESpecialArea.values(), EYesNo.values(), ESupplyWay.values(), EPresaleStatus.values());
 
@@ -170,7 +163,7 @@ public class BdWaresController extends BaseController {
                 // 预售状态
                 waresVo.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + waresVo.getPreSaleStatus()));
 
-                WaresAuthorityVo waresAuthorityVo = waresService.getWaresAuthorityFirst(waresVo.getPkWares());
+                WaresAuthorityVo waresAuthorityVo = iBdWaresService.getWaresAuthorityFirst(waresVo.getPkWares());
                 if (waresAuthorityVo != null) {
                     waresVo.setAuthorityType(waresAuthorityVo.getAuthorityType());
                     waresVo.setAuthorityTypeVal(EWaresPermissionType.getEnumByValue(waresAuthorityVo.getAuthorityType()).getLabel());
@@ -227,7 +220,7 @@ public class BdWaresController extends BaseController {
             LambdaQueryWrapper<BdWares> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(BdWares::getWaresCode, wares.getWaresCode());
             queryWrapper.eq(BdWares::getSpecialArea, wares.getSpecialArea());
-            if (waresService.count(queryWrapper) > 0) {
+            if (iBdWaresService.count(queryWrapper) > 0) {
                 return AjaxResult.error("商品编号重复");
             }
         }
@@ -328,7 +321,7 @@ public class BdWaresController extends BaseController {
             return AjaxResult.error("产品规格至少有一个上架");
         }
 //        wares.setSort(0);
-        waresService.saveWares(wares, userTokenService.getLoginUser());
+        iBdWaresService.saveWares(wares, userTokenService.getLoginUser());
         return AjaxResult.success(wares.getWaresCode());
     }
 
@@ -356,7 +349,7 @@ public class BdWaresController extends BaseController {
             queryWrapper.eq(BdWares::getWaresCode, waresParams.getWaresCode());
             queryWrapper.eq(BdWares::getSpecialArea, waresParams.getSpecialArea());
             queryWrapper.notIn(BdWares::getPkId, waresParams.getWaresId());
-            if (waresService.count(queryWrapper) > 0) {
+            if (iBdWaresService.count(queryWrapper) > 0) {
                 return AjaxResult.error("商品编号重复");
             }
         }
@@ -459,7 +452,7 @@ public class BdWaresController extends BaseController {
         }
 
 //        waresParams.setSort(0);
-        waresService.updateWares(waresParams, userTokenService.getLoginUser());
+        iBdWaresService.updateWares(waresParams, userTokenService.getLoginUser());
         return AjaxResult.success(waresParams.getWaresCode());
     }
 
@@ -472,7 +465,7 @@ public class BdWaresController extends BaseController {
     @DeleteMapping("/{pkId}")
     @Log(module = EOperationModule.WARES_LIST, business = EOperationBusiness.THIRD_WARES_LIST, method = EOperationMethod.DELETE)
     public AjaxResult remove(@PathVariable Integer pkId) {
-        waresService.removeWares(pkId, userTokenService.getLoginUser());
+        iBdWaresService.removeWares(pkId, userTokenService.getLoginUser());
         return AjaxResult.success();
     }
 
@@ -484,11 +477,11 @@ public class BdWaresController extends BaseController {
      */
     @GetMapping("/detail")
     public AjaxResult detail(Long pkId) {
-        R<List<BdRangeExt>> rangeDto = rangeServiceApi.queryRange(SecurityUtils.getPkCountry());
+        R<List<BdRangeExt>> rangeDto = iRangeServiceApi.queryRange(SecurityUtils.getPkCountry());
         List<BdRangeExt> rsList = rangeDto.getData();
         Map<Integer, BdRangeExt> rangeMap = rsList.stream().collect(Collectors.toMap(BdRangeExt::getPkId, Function.identity()));
 
-        BdWares wares = waresService.getById(pkId);
+        BdWares wares = iBdWaresService.getById(pkId);
         LambdaQueryWrapper<BdWaresExtend> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BdWaresExtend::getPkWares, pkId);
         BdWaresExtend waresExtend = waresExtendService.getOne(queryWrapper);
@@ -543,7 +536,7 @@ public class BdWaresController extends BaseController {
         waresParams.setSystemType(waresExtend.getSystemType());
         waresParams.setAreaIncome(wares.getAreaIncome());
         if (waresExtend.getMakerIncome() != null) {
-            R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
+            R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
             waresParams.setMakerIncome(waresExtend.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate()));
         }
 
@@ -605,7 +598,7 @@ public class BdWaresController extends BaseController {
         List<WaresSpecsSkuParams> waresSpecsSkuList = new ArrayList<>();
         for (BdWaresDetail bd : waresDetailList) {
             WaresDetailParams waresDetailParams = BeanUtil.copyProperties(bd, WaresDetailParams.class);
-            BdProduct product = productService.getProduct(bd.getPkProduct());
+            BdProduct product = iBdProductService.getProduct(bd.getPkProduct());
             if (product != null) {
                 waresDetailParams.setProductCode(product.getProductCode());
                 waresDetailParams.setProductName(product.getProductName());
@@ -691,7 +684,7 @@ public class BdWaresController extends BaseController {
                     } else {
                         waresRangeParams.setRangeName(null);
                     }
-                    BdProduct product = productService.getProduct(bdWaresRange.getPkProduct());
+                    BdProduct product = iBdProductService.getProduct(bdWaresRange.getPkProduct());
                     waresRangeParams.setProductCode(product.getProductCode());
                     waresRangeParams.setProductName(product.getProductName());
                     waresRangeParams.setProductCover(product.getCover());
@@ -711,7 +704,7 @@ public class BdWaresController extends BaseController {
                 for (BdWaresDetail bdWaresDetail : waresDetailList) {
                     WaresRangeParams waresRangeParams = new WaresRangeParams();
                     waresRangeParams.setPkRange(rg);
-                    BdProduct product = productService.getProduct(bdWaresDetail.getPkProduct());
+                    BdProduct product = iBdProductService.getProduct(bdWaresDetail.getPkProduct());
                     waresRangeParams.setPkProduct(product.getPkId());
                     waresRangeParams.setProductCode(product.getProductCode());
                     waresRangeParams.setProductName(product.getProductName());
@@ -784,7 +777,7 @@ public class BdWaresController extends BaseController {
     @Log(module = EOperationModule.WARES_LIST, business = EOperationBusiness.THIRD_WARES_LIST, method = EOperationMethod.UP_MOVE)
     public AjaxResult move(Integer waresId, Integer waresMoveType, Integer specialArea) {
         LoginUser loginUser = userTokenService.getLoginUser();
-        waresService.waresMove(waresId, waresMoveType, loginUser, specialArea);
+        iBdWaresService.waresMove(waresId, waresMoveType, loginUser, specialArea);
         return AjaxResult.success();
 
     }
@@ -799,7 +792,7 @@ public class BdWaresController extends BaseController {
     @Log(module = EOperationModule.WARES_LIST, business = EOperationBusiness.THIRD_WARES_LIST, method = EOperationMethod.TOP)
     public AjaxResult floatingRoof(Integer waresId) {
         LoginUser loginUser = userTokenService.getLoginUser();
-        waresService.floatingRoof(waresId, loginUser);
+        iBdWaresService.floatingRoof(waresId, loginUser);
         return AjaxResult.success();
     }
 
@@ -811,7 +804,7 @@ public class BdWaresController extends BaseController {
     @GetMapping("/botton-up")
     public AjaxResult bottomUp(Integer waresId) {
         LoginUser loginUser = userTokenService.getLoginUser();
-        waresService.bottomUp(waresId, loginUser);
+        iBdWaresService.bottomUp(waresId, loginUser);
         return AjaxResult.success();
     }
 
@@ -822,7 +815,7 @@ public class BdWaresController extends BaseController {
      */
     @GetMapping("/create-wares-code")
     public AjaxResult createWaresCode() {
-        String waresCode = CreateNormsCodeUtils.createWaresCode(waresService.getLastWaresCode());
+        String waresCode = CreateNormsCodeUtils.createWaresCode(iBdWaresService.getLastWaresCode());
         return AjaxResult.success(waresCode);
     }
     @GetMapping("/getMaxSortNum")
@@ -838,7 +831,7 @@ public class BdWaresController extends BaseController {
     @GetMapping("/create-wares-sort")
     public AjaxResult createWaresSort() {
         Integer pkCountry = SecurityUtils.getPkCountry();
-        Integer maxSort = waresService.getMaxSort(pkCountry);
+        Integer maxSort = iBdWaresService.getMaxSort(pkCountry);
         if (maxSort == null) {
             maxSort = 0;
         }
@@ -855,7 +848,7 @@ public class BdWaresController extends BaseController {
             queryWrapper.eq(BdWares::getWaresName, waresName);
         }
         queryWrapper.eq(BdWares::getPkCountry, SecurityUtils.getPkCountry());
-        List<BdWares> list = waresService.list(queryWrapper);
+        List<BdWares> list = iBdWaresService.list(queryWrapper);
         List<WaresEntnyOrderVo> resultList = new ArrayList<>();
         for (BdWares bdWares : list) {
             WaresEntnyOrderVo waresEntnyOrderVo = new WaresEntnyOrderVo();
@@ -957,7 +950,7 @@ public class BdWaresController extends BaseController {
         }
         queryWrapper.eq(BdWares::getPkCountry, SecurityUtils.getPkCountry());
         queryWrapper.eq(BdWares::getSystemType, SecurityUtils.getSystemType());
-        List<BdWares> list = waresService.list(queryWrapper);
+        List<BdWares> list = iBdWaresService.list(queryWrapper);
         return AjaxResult.success(list);
     }
 
@@ -969,7 +962,7 @@ public class BdWaresController extends BaseController {
         for (ComputeWaresPrice computeWaresPrice : computhParams.getComputeWaresPriceList()) {
             computeWaresPrice.setPkWares(computhParams.getPkWares());
         }
-        return AjaxResult.success(waresService.computeWaresPrice(computhParams.getComputeWaresPriceList(), computhParams.getSpecialArea()));
+        return AjaxResult.success(iBdWaresService.computeWaresPrice(computhParams.getComputeWaresPriceList(), computhParams.getSpecialArea()));
     }
 
     /**
@@ -981,7 +974,7 @@ public class BdWaresController extends BaseController {
     @Log(module = EOperationModule.WARES_LIST, business = EOperationBusiness.WARES_LIST, method = EOperationMethod.APPROVAL, remark = "商品新増审批")
     @PostMapping("/wares-approve")
     public AjaxResult waresApprove(@Valid @RequestBody WaresApproveParam param) {
-        waresService.update(Wrappers.<BdWares>lambdaUpdate()
+        iBdWaresService.update(Wrappers.<BdWares>lambdaUpdate()
                 .eq(BdWares::getPkId, param.getPkWares())
                 .eq(BdWares::getWaresStatus, EApproveStatus.ALREADY_SUBMIT.getValue())
                 .set(BdWares::getWaresStatus, EApproveStatus.FINISH.getValue())

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/ComputeWaresPrice.java

@@ -7,14 +7,6 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * @BelongsProject: hzs_cloud
- * @BelongsPackage: com.hzs.sale.wares.param
- * @Author: yh
- * @CreateTime: 2023-06-29  09:39
- * @Description: TODO
- * @Version: 1.0
- */
 @Data
 public class ComputeWaresPrice {
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresParams.java

@@ -15,11 +15,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description: 返回到前台的商品信息
+ * 返回到前台的商品信息
- * @Author: sui q
- * @Time: 2022/9/19 9:25
- * @Classname: CuWaresParams
- * @PackageName: com.hzs.sale.wares.param
  */
 @Data
 @Builder

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/TransportPostage.java

@@ -2,13 +2,6 @@ package com.hzs.sale.wares.param;
 
 import lombok.Data;
 
-/**
- * @Description:
- * @Author: yuhui
- * @Time: 2022/11/2 16:25
- * @Classname: TransportPostage
- * @PackageName: com.hzs.sale.wares.param
- */
 @Data
 public class TransportPostage {
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/SaTWaresQueryVO.java

@@ -1,196 +0,0 @@
-package com.hzs.sale.wares.vo;
-
-import com.hzs.common.core.annotation.Excel;
-import com.hzs.common.core.annotation.Transaction;
-import com.hzs.common.core.constant.EnumsPrefixConstants;
-import com.hzs.common.core.utils.StringUtils;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @Description: 三方商品列表VO
- * @Author: jiang chao
- * @Time: 2023/5/24 15:57
- * @Classname: SaTWaresQueryVO
- * @PackageName: com.hzs.sale.wares.vo
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@Data
-public class SaTWaresQueryVO {
-
-    /**
-     * 主键
-     */
-    private Long pkId;
-    /**
-     * 三方商品表ID
-     */
-    private Long pkTWares;
-
-    /**
-     * 三方商品SKU表ID
-     */
-    @Excel(name = "直供序号")
-    private Long pkTWaresSku;
-
-    /**
-     * 商品名称
-     */
-    @Excel(name = "商品名称")
-    private String productName;
-
-    /**
-     * 分类显示
-     */
-    @Excel(name = "商品分类")
-    private String titleCategory;
-
-    public String getTitleCategory() {
-        if (StringUtils.isNotEmpty(this.titleCategoryOne)) {
-            titleCategory = this.titleCategoryOne;
-        }
-        if (StringUtils.isNotEmpty(this.titleCategoryTwo)) {
-            titleCategory += "-" + this.titleCategoryTwo;
-        }
-        if (StringUtils.isNotEmpty(this.titleCategoryThree)) {
-            titleCategory += "-" + this.titleCategoryThree;
-        }
-        return titleCategory;
-    }
-
-    /**
-     * 商品图片
-     */
-    private String cover;
-
-    /**
-     * 品牌名称
-     */
-    private String brandName;
-    /**
-     * 规格值冗余
-     */
-    @Excel(name = "商品规格")
-    private String specValueNames;
-
-    /**
-     * 来源渠道
-     */
-    private Integer source;
-    /**
-     * 来源渠道显示
-     */
-    @Excel(name = "平台")
-    private String sourceVal;
-
-    /**
-     * 协议价（供应价）
-     */
-    @Excel(name = "供应价(¥)")
-    private BigDecimal agreementPrice;
-    /**
-     * 商品售价
-     */
-    @Excel(name = "售价(¥)")
-    private BigDecimal price;
-    /**
-     * 商品pv
-     */
-    @Excel(name = "业绩(¥)")
-    private BigDecimal achieve;
-
-    /**
-     * 商品PV（美元）
-     */
-    @Excel(name = "业绩($)")
-    private BigDecimal achievementDollar;
-    /**
-     * 分享pv
-     */
-    private BigDecimal shareAchieve;
-
-    /**
-     * 毛利润
-     */
-    @Excel(name = "毛利润(¥)")
-    private BigDecimal grossProfit;
-    /**
-     * 净利润
-     */
-    @Excel(name = "纯利润(¥)")
-    private BigDecimal netProfit;
-
-    /**
-     * 是否上架（0=上架，1=下架）
-     */
-    private Integer isPutOn;
-
-    /**
-     * 是否推荐（0=推荐，1=不推荐）
-     */
-    @Transaction(transactionKey = EnumsPrefixConstants.RECOMMEND_TYPE)
-    private Integer isRecommend;
-    /**
-     * 是否推荐
-     */
-    private String isRecommendVal;
-
-    /**
-     * 商品分类（一级分类）
-     */
-    private Long pkCategoryOne;
-    /**
-     * 一级分类名称
-     */
-    private String titleCategoryOne;
-
-    /**
-     * 商品分类（二级分类）
-     */
-    private Long pkCategoryTwo;
-    /**
-     * 一级分类名称
-     */
-    private String titleCategoryTwo;
-
-    /**
-     * 商品分类（三级分类）
-     */
-    private Long pkCategoryThree;
-    /**
-     * 一级分类名称
-     */
-    private String titleCategoryThree;
-
-
-    /**
-     * 虚拟销量
-     */
-    @Excel(name = "虚拟销量")
-    private Integer sale;
-
-    /**
-     * 实际销量
-     */
-    @Excel(name = "实际销量")
-    private Integer realSale;
-
-    /**
-     * 销量
-     */
-    @Excel(name = "销量")
-    private Integer allSale;
-
-    /**
-     * 下架备注
-     */
-    @Excel(name = "下架说明")
-    private String putOnRemark;
-
-}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/SaTWaresSkuVo.java

@@ -1,26 +1,10 @@
-package com.hzs.sale.wares.vo;/**
+package com.hzs.sale.wares.vo;
- * @Description:
- * @Author: yuhui
- * @Time: 2023/5/19 17:13
- * @Classname: SaTWaresSkuVo
- * @PackageName: com.hzs.sale.wares.vo
- */
 
 import com.alibaba.fastjson2.JSONArray;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.sale.wares.vo
- *@Author: yh
- *@CreateTime: 2023-05-19  17:13
- *@Description: TODO
- *@Version: 1.0
- */
 @Data
 public class SaTWaresSkuVo {
 

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/TWaresQueryVO.java

@@ -1,136 +0,0 @@
-package com.hzs.sale.wares.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @Description: 三方商品定价查询VO
- * @Author: jiang chao
- * @Time: 2023/5/18 10:57
- * @Classname: TWaresQueryVO
- * @PackageName: com.hzs.sale.wares.vo
- */
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Data
-public class TWaresQueryVO {
-
-    /**
-     * 产品主键
-     */
-    private Long pkId;
-    /**
-     * 商品主键
-     */
-    private Long pkTWares;
-
-    /**
-     * skuId
-     */
-    private Long tId;
-    /**
-     * 商品ID
-     */
-    private Long pkThWares;
-
-    /**
-     * 商品名称
-     */
-    private String title;
-    /**
-     * 商品图片
-     */
-    private String cover;
-    /**
-     * 商品分类（全部级别，需要处理后返回）
-     */
-    private String thirdCategoryName;
-
-    /**
-     * 商品分类（一级分类）
-     */
-    private String category;
-    /**
-     * 商品类目（二级分类）
-     */
-    private String classify;
-
-    /**
-     * 品牌名称
-     */
-    private String thirdBrandName;
-
-    /**
-     * 规格值组合
-     */
-    private String specValueNames;
-
-    /**
-     * 来源平台
-     */
-    private Integer source;
-    /**
-     * 来源平台显示
-     */
-    private String sourceVal;
-
-    /**
-     * 规格协议价（单位：分） 供应价
-     */
-    private BigDecimal agreementPrice;
-    /**
-     * 规格指导价（单位：分）
-     */
-    private BigDecimal guidePrice;
-
-    /**
-     * 上下架状态（0=下架，1=上架） -- 三方状态，需要转换成系统状态
-     */
-    private Integer status;
-
-    /**
-     * 是否定价（0=是，1=否）
-     */
-    private Integer confirmPrice;
-
-    /**
-     * 是否显示（0=显示，1=隐藏）
-     */
-    private Integer showFlag;
-
-    /**
-     * 售价
-     */
-    private BigDecimal price;
-
-    /**
-     * 业绩
-     */
-    private BigDecimal achievement;
-
-    /**
-     * 业绩（美元）
-     */
-    private BigDecimal achievementDollar;
-
-    /**
-     * 分享业绩
-     */
-    private BigDecimal shareAchieve;
-
-    /**
-     * 毛利润
-     */
-    private BigDecimal grossProfit;
-
-    /**
-     * 净利润
-     */
-    private BigDecimal netProfit;
-
-}

bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml

@@ -35,7 +35,7 @@
         update ac_pick ap
         set ap.modified_time = sysdate,
         ap.pk_modified = #{pkModified},
-        ap.usable_quantity = ap.usable_quantity - #{quantity},
+        ap.usable_quantity = ap.usable_quantity - #{quantity}
         where ap.del_flag = 0
         and ap.pk_member = #{pkMember}
         and ap.pick_type = #{pickType}
@@ -221,4 +221,46 @@
         order by creation_time
     </select>
 
+    <!-- 批量处理提货数据 -->
+    <update id="batchSaveOrUpdatePick">
+        merge into AC_PICK ap
+        using (
+        <foreach collection="pickList" item="items" separator=" union all ">
+            select #{items.pkMember} pk_member,
+            #{items.pickType} pick_type,
+            #{items.pkDataId} pk_data_id,
+            #{items.specsName} specs_name,
+            #{items.specsNameId} specs_name_id,
+            #{items.usableQuantity} usable_quantity,
+            #{items.baseQuantity} base_quantity,
+            #{items.pkCreator} pk_creator
+            from dual
+        </foreach>
+        ) tmp
+        on (tmp.pk_member = ap.pk_member and tmp.pick_type = ap.pick_type and tmp.pk_data_id = ap.pk_data_id
+        and tmp.specs_name = ap.specs_name and ap.specs_name_id = ap.specs_name_id and tmp.base_quantity = ap.base_quantity)
+        WHEN NOT MATCHED THEN
+        insert
+        (pk_id,
+        pk_member,
+        pick_type,
+        pk_data_id,
+        specs_name,
+        specs_name_id,
+        usable_quantity,
+        pk_creator,
+        base_quantity)
+        values (ac_pick_seq.nextval,
+        tmp.pk_member,
+        tmp.pick_type,
+        tmp.pk_data_id,
+        tmp.specs_name,
+        tmp.specs_name_id,
+        tmp.usable_quantity,
+        tmp.pk_creator,
+        tmp.base_quantity)
+        WHEN MATCHED THEN
+        update set ap.usable_quantity = ap.usable_quantity + tmp.usable_quantity
+    </update>
+
 </mapper>

bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdDeliveryController.java

@@ -19,11 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Description: 发货方式 控制器
+ * 发货方式 控制器
- * Author: jiang chao
- * Time: 2022/10/11 13:52
- * Classname: BdDeliveryController
- * PackageName: com.hzs.system.config.controller.manage
  */
 @Slf4j
 @RestController
@@ -50,6 +46,7 @@ public class BdDeliveryController extends BaseController {
             // 创建最终返回内容
             DeliveryVO tmpDelivery = DeliveryVO.builder()
                     .deliveryValue(value.getValue())
+                    .deliveryValueVal(EDelivery.getLabelByValue(value.getValue()))
                     .build();
             resultList.add(tmpDelivery);
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/DeliveryVO.java

@@ -1,18 +1,12 @@
 package com.hzs.system.config.vo;
 
-import com.hzs.common.core.annotation.Transaction;
-import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @Description: 发货方式VO
+ * 发货方式VO
- * @Author: jiang chao
- * @Time: 2022/11/11 18:06
- * @Classname: DeliveryVO
- * @PackageName: com.hzs.system.config.vo
  */
 @AllArgsConstructor
 @NoArgsConstructor
@@ -28,7 +22,6 @@ public class DeliveryVO {
     /**
      * 值
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY)
     private Integer deliveryValue;
 
     /**

bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java

@@ -584,7 +584,7 @@ public class EnumsController extends BaseController {
         List<EnumEntity> enumEntityList = new ArrayList<>();
         for (EActType value : EActType.values()) {
             if (EYesNo.YES.getIntValue() == value.getEnable()) {
-                enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ACT_TYPE));
+                enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
             }
         }
         return AjaxResult.success(enumEntityList);
@@ -617,11 +617,6 @@ public class EnumsController extends BaseController {
 
     /**
      * 发货方式
-     *
-     * @author: zhang jing
-     * @date: 2022/9/30 16:28
-     * @param: []
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/delivery-list")
     public AjaxResult deliveryList(Integer pkCountry) {
@@ -634,19 +629,15 @@ public class EnumsController extends BaseController {
         for (BdDelivery delivery : deliveryList) {
             EDelivery value = EDelivery.getDelivery(delivery.getValue());
             if (null != value) {
-                enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.DELIVERY));
+                enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
             }
         }
+        enumEntityList.add(new EnumEntity(EDelivery.PICK.getValue(), EDelivery.PICK.getLabel()));
         return AjaxResult.success(enumEntityList);
     }
 
     /**
      * 发货状态
-     *
-     * @author: zhang jing
-     * @date: 2022/9/30 16:30
-     * @param: []
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/delivery-status")
     public AjaxResult deliveryStatus() {
@@ -659,11 +650,6 @@ public class EnumsController extends BaseController {
 
     /**
      * 首页banner类型枚举类
-     *
-     * @author: zhang jing
-     * @date: 2022/10/13 11:27
-     * @param: []
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/getEHomeBannerTypeList")
     public AjaxResult getEHomeBannerTypeList() {
@@ -676,11 +662,6 @@ public class EnumsController extends BaseController {
 
     /**
      * 转账特殊设置枚举
-     *
-     * @author: zhang jing
-     * @date: 2022/10/21 9:58
-     * @param: []
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/getETransferSpecialList")
     public AjaxResult getETransferSpecialList() {
@@ -693,11 +674,6 @@ public class EnumsController extends BaseController {
 
     /**
      * 用户状态枚举
-     *
-     * @author: zhang jing
-     * @date: 2022/10/21 17:39
-     * @param: []
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/getEUserStatusList")
     public AjaxResult getEUserStatusList() {
@@ -710,11 +686,6 @@ public class EnumsController extends BaseController {
 
     /**
      * 钱包状态枚举
-     *
-     * @author: zhang jing
-     * @date: 2022/10/21 17:41
-     * @param: []
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/get-sallet-status")
     public AjaxResult getEWalletStatusList() {
@@ -739,11 +710,6 @@ public class EnumsController extends BaseController {
 
     /**
      * 是否经销商枚举类
-     *
-     * @author: zhang jing
-     * @date: 2022/10/21 17:46
-     * @param: []
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/dealer-yes-no")
     public AjaxResult dealerYesNo() {
@@ -756,11 +722,6 @@ public class EnumsController extends BaseController {
 
     /**
      * 系统是否枚举类
-     *
-     * @author: zhang jing
-     * @date: 2022/10/21 17:46
-     * @param: []
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/yes-no")
     public AjaxResult yesNo() {
@@ -1120,37 +1081,13 @@ public class EnumsController extends BaseController {
     public AjaxResult orderStatus() {
         List<EnumEntity> enumEntityList = new ArrayList<>();
         for (EOrderStatus value : EOrderStatus.values()) {
-            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ORDER_STATUS));
+            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
         }
         return AjaxResult.success(enumEntityList);
     }
 
-    /**
-     * 订单状态（会员端）
-     *
-     * @return
-     */
-    /* 2025年6月10日 删除获取订单状态接口
-    @GetMapping("/order-status-api")
-    public AjaxResult orderStatusApi() {
-        List<EnumEntity> enumEntityList = new ArrayList<>();
-        for (EOrderStatus value : EOrderStatus.values()) {
-            if (value.getValue() != EOrderStatus.SHIPPING.getValue() && value.getValue() != EOrderStatus.CANCEL.getValue()) {
-                // 会员端使用 已合单和已撤单 不显示
-                enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ORDER_STATUS));
-            }
-        }
-        return AjaxResult.success(enumEntityList);
-    }
-     */
-
     /**
      * 奖项枚举类
-     *
-     * @author: zhang jing
-     * @date: 2022/11/9 19:54
-     * @param: []
-     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/bonus-items")
     public AjaxResult bonusItems() {
@@ -1829,7 +1766,7 @@ public class EnumsController extends BaseController {
     public AjaxResult actTypeAll() {
         List<EnumEntity> enumEntityList = new ArrayList<>();
         for (EActType value : EActType.values()) {
-            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ACT_TYPE));
+            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
         }
         return AjaxResult.success(enumEntityList);
     }
@@ -2383,7 +2320,7 @@ public class EnumsController extends BaseController {
     public AjaxResult pickType() {
         List<EnumEntity> enumEntityList = new ArrayList<>();
         for (EPickType value : EPickType.values()) {
-            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ACT_TYPE));
+            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
         }
         return AjaxResult.success(enumEntityList);
     }

bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java

@@ -240,11 +240,6 @@ public class EnumsInitController {
             initList.add(this.createData(value.getKey(), value.getLabel()));
         }
 
-        //活动类型
-        for (EActType value : EActType.values()) {
-            initList.add(this.createData(value.getKey(), value.getLabel()));
-        }
-
         //条码状态
         for (EBarcodeStatus value : EBarcodeStatus.values()) {
             initList.add(this.createData(value.getKey(), value.getLabel()));
@@ -255,11 +250,6 @@ public class EnumsInitController {
             initList.add(this.createData(value.getKey(), value.getLabel()));
         }
 
-        //发货方式
-        for (EDelivery value : EDelivery.values()) {
-            initList.add(this.createData(value.getKey(), value.getLabel()));
-        }
-
         //发货状态
         for (EDeliveryStatus value : EDeliveryStatus.values()) {
             initList.add(this.createData(value.getKey(), value.getLabel()));
@@ -387,13 +377,6 @@ public class EnumsInitController {
             initList.add(this.createData(value.getKey(), value.getLabel()));
         }
 
-        /**
-         * 订单状态
-         */
-        for (EOrderStatus value : EOrderStatus.values()) {
-            initList.add(this.createData(value.getKey(), value.getLabel()));
-        }
-
         /**
          * 预售状态
          */

bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RetailConstants.java

@@ -9,6 +9,11 @@ import java.util.List;
  */
 public class RetailConstants {
 
+    /**
+     * 分公司提货产品基数
+     */
+    public static final Integer PICK_BASE = 4;
+
     /**
      * 会员 推 会员 60
      * VIP 推 会员 80

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java

@@ -14,32 +14,32 @@ public enum EActType {
     /**
      * 商品赠品
      */
-    PRODUCT_GIFT(11, "商品赠品", 0, EnumsPrefixConstants.ACT_TYPE + "11"),
+    PRODUCT_GIFT(11, "商品赠品", 0),
 
     /**
      * 消费赠送
      */
-    CONSUMPTION_GIFT(12, "消费赠送", 0, EnumsPrefixConstants.ACT_TYPE + "12"),
+    CONSUMPTION_GIFT(12, "消费赠送", 0),
 
     /**
      * 直推赠送
      */
-    DIRECT_PUSH_GIFT(13, "直推赠送", 0, EnumsPrefixConstants.ACT_TYPE + "13"),
+    DIRECT_PUSH_GIFT(13, "直推赠送", 0),
 
     /**
      * 抽奖
      */
-    LOTTERY_DRAW(17, "抽奖", 0, EnumsPrefixConstants.ACT_TYPE + "17"),
+    LOTTERY_DRAW(17, "抽奖", 0),
 
     /**
      * 会员消费赠送 活动
      */
-    MEMBER_CONSUMPTION(25, "会员消费赠送", 0, EnumsPrefixConstants.ACT_TYPE + "25"),
+    MEMBER_CONSUMPTION(25, "会员消费赠送", 0),
 
     /**
      * 提货赠送活动
      */
-    PICK_GIFT(30, "提货赠送活动", 0, EnumsPrefixConstants.ACT_TYPE + "30"),
+    PICK_GIFT(30, "提货赠送活动", 0),
 
     ;
 
@@ -55,8 +55,4 @@ public enum EActType {
      * 是否启用（0=是,1=否） -- 来源EYesNo
      */
     private final int enable;
-    /**
-     * 国际化翻译key值
-     */
-    private final String key;
 }

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java

@@ -1,6 +1,5 @@
 package com.hzs.common.core.enums;
 
-import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -14,27 +13,32 @@ public enum EDelivery {
     /**
      *
      */
-    EMPTY(0, "未知", 1, EnumsPrefixConstants.DELIVERY + "0"),
+    EMPTY(0, "未知", 1),
 
     /**
      * 快递发货
      */
-    FAST_MAIL(1, "快递发货", 0, EnumsPrefixConstants.DELIVERY + "1"),
+    FAST_MAIL(1, "快递发货", 0),
 
     /**
      * 公司自提
      */
-    COMPANY_PICKED_UP(2, "公司自提", 0, EnumsPrefixConstants.DELIVERY + "2"),
+    COMPANY_PICKED_UP(2, "公司自提", 0),
 
     /**
      * 店铺自提
      */
-    SHOP_PICKED_UP(3, "店铺自提", 0, EnumsPrefixConstants.DELIVERY + "3"),
+    SHOP_PICKED_UP(3, "店铺自提", 0),
 
     /**
      * 店铺配送
      */
-    SHOP_DELIVERY(4, "店铺配送", 0, EnumsPrefixConstants.DELIVERY + "4"),
+    SHOP_DELIVERY(4, "店铺配送", 0),
+
+    /**
+     * 提货中心
+     */
+    PICK(6, "提货中心", 0),
 
     ;
 
@@ -50,10 +54,6 @@ public enum EDelivery {
      * 是否启用（0=是,1=否） -- 来源EYesNo
      */
     private final int enable;
-    /**
-     * 国际化翻译key值
-     */
-    private final String key;
 
     public static EDelivery getDelivery(int value) {
         for (EDelivery eDelivery : EDelivery.values()) {
@@ -63,4 +63,23 @@ public enum EDelivery {
         }
         return EDelivery.EMPTY;
     }
+
+    /**
+     * 根据值返回显示内容
+     *
+     * @param value
+     * @return
+     */
+    public static String getLabelByValue(Integer value) {
+        if (null == value) {
+            return "";
+        }
+        for (EDelivery enums : EDelivery.values()) {
+            if (enums.getValue() == value) {
+                return enums.getLabel();
+            }
+        }
+        return "";
+    }
+
 }

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderStatus.java

@@ -1,18 +1,10 @@
 package com.hzs.common.core.enums;
 
-import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
- * @Description: 订单状态
+ * 订单状态
- * @Author: sui q
- * @Time: 2022/8/31 9:14
- * @Classname: EOrderStatus
- * @PackageName: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter
@@ -21,32 +13,37 @@ public enum EOrderStatus {
     /**
      * 0=待付款
      */
-    WAIT_PAY(0, "待付款", 0, EnumsPrefixConstants.ORDER_STATUS + "0"),
+    WAIT_PAY(0, "待付款", 0),
 
     /**
      * 1=待发货
      */
-    PAY(1, "待发货", 0, EnumsPrefixConstants.ORDER_STATUS + "1"),
+    PAY(1, "待发货", 0),
 
     /**
      * 2=已合单
      */
-    SHIPPING(2, "已合单", 0, EnumsPrefixConstants.ORDER_STATUS + "2"),
+    SHIPPING(2, "已合单", 0),
 
     /**
      * 3=待收货
      */
-    DELIVERED(3, "待收货", 0, EnumsPrefixConstants.ORDER_STATUS + "3"),
+    DELIVERED(3, "待收货", 0),
 
     /**
      * 4=已关闭
      */
-    CANCEL(4, "已关闭", 0, EnumsPrefixConstants.ORDER_STATUS + "4"),
+    CANCEL(4, "已关闭", 0),
 
     /**
      * 5=已收货
      */
-    RECEIVED(5, "已收货", 0, EnumsPrefixConstants.ORDER_STATUS + "5"),
+    RECEIVED(5, "已收货", 0),
+
+    /**
+     * 6=提货中心
+     */
+    PICK(6, "提货中心", 0),
 
     ;
 
@@ -62,39 +59,23 @@ public enum EOrderStatus {
      * 是否启用（0=是,1=否） -- 来源EYesNo
      */
     private final int enable;
-    /**
-     * 国际化翻译key值
-     */
-    private final String key;
 
     /**
-     * 会员前端列表
+     * 根据值获取显示内容
-     */
-    private static List<EOrderStatus> apiList;
-
-    /**
-     * 获取会员前端列表
      *
+     * @param value
      * @return
      */
-    public static List<EOrderStatus> getApiList() {
+    public static String getLabelByValue(Integer value) {
-        if (null == apiList) {
+        if (null == value) {
-            apiList = new ArrayList<>();
+            return "";
-            apiList.add(WAIT_PAY);
-            apiList.add(PAY);
-            apiList.add(DELIVERED);
-            apiList.add(RECEIVED);
         }
-        return apiList;
+        for (EOrderStatus enums : EOrderStatus.values()) {
-    }
+            if (enums.value == value) {
-
+                return enums.getLabel();
-    public static  EOrderStatus getEOrderStatus(int value){
-        for (EOrderStatus eOrderStatus : EOrderStatus.values()) {
-            if (eOrderStatus.value == value){
-                return eOrderStatus;
             }
         }
-        return null;
+        return "";
     }
 
 }

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPickType.java

@@ -1,6 +1,5 @@
 package com.hzs.common.core.enums;
 
-import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -12,29 +11,34 @@ import lombok.Getter;
 public enum EPickType {
 
     /**
-     * 关联 BS_PRODUCT 表
+     * 关联 BD_PRODUCT 表
      */
-    PICK_PRODUCT(0, "提货产品", EnumsPrefixConstants.ACT_TYPE + "0"),
+    PICK_PRODUCT(0, "提货产品"),
 
     /**
-     * 关联 BS_PRODUCT 表（一次全部提走）
+     * 关联 BD_PRODUCT 表（一次全部提走）
      */
-    PRIZE(1, "抽奖", EnumsPrefixConstants.ACT_TYPE + "1"),
+    PRIZE(1, "抽奖"),
 
     /**
      * 关联 AC_GIFT_CONFIG 表
      */
-    CONSUMPTION_GIFT(12, "消费赠送", EnumsPrefixConstants.ACT_TYPE + "12"),
+    CONSUMPTION_GIFT(12, "消费赠送"),
 
     /**
      * 关联 AC_GIFT_CONFIG 表
      */
-    DIRECT_PUSH_GIFT(13, "直推赠送", EnumsPrefixConstants.ACT_TYPE + "13"),
+    DIRECT_PUSH_GIFT(13, "直推赠送"),
 
     /**
      * 关联 AC_GIFT_CONFIG 表
      */
-    LOTTERY_DRAW(17, "抽奖", EnumsPrefixConstants.ACT_TYPE + "17"),
+    LOTTERY_DRAW(17, "抽奖"),
+
+    /**
+     * 关联 BD_PRODUCT 表
+     */
+    COMPANY_PRODUCT(20, "分公司产品"),
 
     ;
 
@@ -46,10 +50,6 @@ public enum EPickType {
      * 显示标签
      */
     private final String label;
-    /**
-     * 国际化翻译key值
-     */
-    private final String key;
 
     /**
      * 根据枚举值查询枚举

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/base/AcBaseConfig.java

@@ -18,9 +18,6 @@ import lombok.experimental.Accessors;
 
 /**
  * 活动基本配置表
- *
- * @author hzs
- * @since 2023-04-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/pick/AcPick.java

@@ -8,13 +8,15 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.hzs.common.core.web.domain.BaseEntity;
-import lombok.Data;
+import lombok.*;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
  * 提货基础表
  */
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/pick/AcRetailPickMemberLog.java

@@ -14,12 +14,7 @@ import lombok.*;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 新零售会员提货日志
- * </p>
- *
- * @author hzs
- * @since 2025-01-09
  */
 @Builder
 @AllArgsConstructor

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/activity/pick/ext/AcPickLogExt.java

@@ -7,11 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * @Description: 提货操作日志扩展表
+ * 提货操作日志扩展表
- * @Author: jiang chao
- * @Time: 2023/4/24 17:11
- * @Classname: AcPickLogExt
- * @PackageName: com.hzs.common.domain.activity.pick.ext
  */
 @EqualsAndHashCode(callSuper = true)
 @Data

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdDelivery.java

@@ -11,9 +11,6 @@ import lombok.experimental.Accessors;
 
 /**
  * 发货方式表
- *
- * @author hzs
- * @since 2022-10-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)