no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -540,8 +540,8 @@ public class WebsitPartsSalesOrderLogic {
     @Transactional
     public WebsitPartsSalesBean changeCash(String id) throws Exception {
         WebsitPartsSalesBean partsSalesOrderBean = this.loadSalesOrderById(id);
-        AdminWebsit shop = adminWebsitService.getById(partsSalesOrderBean.getWebsitId());
-        if (!shop.getPartsIsCash()) {
+        AdminWebsit websit = adminWebsitService.getById(partsSalesOrderBean.getWebsitId());
+        if (!websit.getPartsIsCash()) {
             throw new RemoteServiceException("当前配件网点不支付现金方式");
         }
         if (partsSalesOrderBean.getIsApply().equals(IsEnum.Y.getValue())) {
@@ -553,14 +553,14 @@ public class WebsitPartsSalesOrderLogic {
         partsSalesOrderBean.setPayFlag(PartsPayFlagEnum.PAY_NOT_TAKE.getKey());
         partsSalesOrderBean.setPayType(PayTypeEnum.CASH.getKey());
 
-        this.handleForwardShopAndWorkerStock(partsSalesOrderBean);
+        this.handleForwardWebsitAndWorkerStock(partsSalesOrderBean);
 
 
         websitPartsSalesService.saveOrUpdate(partsSalesOrderBean);
         return partsSalesOrderBean;
     }
 
-    private void handleForwardShopAndWorkerStock(WebsitPartsSalesBean partsSalesOrderBean) throws Exception {
+    private void handleForwardWebsitAndWorkerStock(WebsitPartsSalesBean partsSalesOrderBean) throws Exception {
         // 扣减网点库存
         List<WebsitStockDTO> shopStockDTOList = this.getWebsitStock(partsSalesOrderBean, DirectFlagEnum.SUB, PartsRefTypeEnum.SALES.getRemark());
         materialGoodsStockLogic.handleWebsitStock(shopStockDTOList);
@@ -821,7 +821,7 @@ public class WebsitPartsSalesOrderLogic {
             throw new RemoteServiceException("销售申请单转销售单失败，没有该单号: " + id) ;
         }
 
-        this.handleForwardShopAndWorkerStock(partsSalesOrderBean);
+        this.handleForwardWebsitAndWorkerStock(partsSalesOrderBean);
 
         websitPartsSalesService.lambdaUpdate()
                 .set(WebsitPartsSales::getIsApply, IsEnum.N.getValue())
@@ -859,6 +859,7 @@ public class WebsitPartsSalesOrderLogic {
                 workerStockDTO.setIdentity(item.getIdentity());
                 workerStockDTO.setWorkerId(partsSalesOrderBean.getWorkerId());
                 workerStockDTO.setWorkerName(partsSalesOrderBean.getWorkerName());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setWebsitId(partsSalesOrderBean.getWebsitId());
                 workerStockDTO.setWebsitName(partsSalesOrderBean.getWebsitName());
                 workerStockDTO.setSdate(DateUtil.date());
@@ -880,6 +881,8 @@ public class WebsitPartsSalesOrderLogic {
             }
             if (StringUtils.isNotBlank(partsAttr2)) {
                 WorkerStockDTO workerStockDTO = new WorkerStockDTO();
+                workerStockDTO.setCompanyWechatId(partsSalesOrderBean.getCompanyWechatId());
+                workerStockDTO.setCompanyWechatName(partsSalesOrderBean.getCompanyWechatName());
                 workerStockDTO.setIdentity(item.getIdentity());
                 workerStockDTO.setWorkerId(partsSalesOrderBean.getWorkerId());
                 workerStockDTO.setWorkerName(partsSalesOrderBean.getWorkerName());
@@ -887,6 +890,7 @@ public class WebsitPartsSalesOrderLogic {
                 workerStockDTO.setWebsitName(partsSalesOrderBean.getWebsitName());
                 workerStockDTO.setSdate(DateUtil.date());
                 workerStockDTO.setPartsWebsitId(item.getPartsWebsitId());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(item.getPartsNumber());
                 workerStockDTO.setGoodsName(item.getPartsName());
                 workerStockDTO.setMaterialGroupName(item.getMaterialGroupName());
@@ -929,7 +933,7 @@ public class WebsitPartsSalesOrderLogic {
             websitStockDTO.setRefType(refType);
             websitStockDTO.setVoucherNo(partsSalesOrderBean.getId());
             websitStockDTO.setApplyNo(partsSalesOrderBean.getId());
-            websitStockDTO.setObj(PartsRefTypeEnum.SALES.getKey());
+            websitStockDTO.setObj(partsSalesOrderBean.getBuyPeople().equals(BuyPeopleEnum.CUSTOMER.getKey()) ? BuyPeopleEnum.CUSTOMER.getRemark() : BuyPeopleEnum.WORKER.getRemark());
             websitStockDTO.setPartsAttr(PartsAttrEnum.NEW.getKey());
             websitStockDTO.setChangeQty(item.getQty());
             websitStockDTO.setDirectFlag(directFlag.getKey());