no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/stock/PartsStockLogic.java

@@ -1,24 +1,11 @@
 package com.gree.mall.manager.bean.material.stock;
 
 import com.gree.mall.manager.commonmapper.MaterialMapper;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.plus.entity.WebsitPartsNewRefundManageRecord;
-import com.gree.mall.manager.plus.entity.WebsitPartsSalesItem;
 import com.gree.mall.manager.plus.service.WebsitPartsSalesItemService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.integration.redis.util.RedisLockRegistry;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -29,61 +16,5 @@ public class PartsStockLogic {
     private final MaterialMapper materialMapper;
     private final WebsitPartsSalesItemService websitPartsSalesItemService;
 
-    /**
-     * 恢复新件销售数量
-     * @param
-     */
-    public void revertNewPartsSalesQty(String websitId, String partsWebsitId, String identity,
-                                       List<WebsitPartsNewRefundManageRecord> partsNewRefundManageRecordList) throws Exception {
-        // 锁定销售单明细
-        String lockName = websitId + "|" + partsWebsitId + "|" + identity;
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.WRITE_SALES_ITEM + lockName);
-        if(!obtain.tryLock(10, TimeUnit.SECONDS)){
-            throw new RemoteServiceException("销售明细已冻结:" + lockName);
-        }
-        // 处理销售单明细
-        try{
-            // 查询销售的明细
-            List<WebsitPartsSalesItem> salesOrderItems = materialMapper.querySalesItemByItemId(websitId, partsWebsitId,
-                    identity, partsNewRefundManageRecordList.stream()
-                            .map(WebsitPartsNewRefundManageRecord::getSalesItemId)
-                            .collect(Collectors.toList()));
-
-            Map<String, WebsitPartsSalesItem> salesOrderItemMap = salesOrderItems.stream()
-                    .collect(Collectors.toMap(WebsitPartsSalesItem::getId, Function.identity()));
-            for (WebsitPartsNewRefundManageRecord partsNewRefundManageRecord : partsNewRefundManageRecordList) {
-                WebsitPartsSalesItem partsSalesOrderItem = salesOrderItemMap.get(partsNewRefundManageRecord.getSalesItemId());
-                partsSalesOrderItem.setNewRefundQty(partsSalesOrderItem.getNewRefundQty().subtract(partsNewRefundManageRecord.getQty()));
-                partsSalesOrderItem.setQty(partsSalesOrderItem.getQty().add(partsNewRefundManageRecord.getQty()));
-            }
-
-            // 更新销售明细数据
-            websitPartsSalesItemService.saveOrUpdateBatch(salesOrderItemMap.values());
-
-        } finally {
-            this.txCallUnlockSalesItem(obtain);
-        }
-    }
-
-    private void txCallUnlockSalesItem(Lock obtain) {
-        //事务提交完成后才释放锁,此方法禁止执行mysql相关操作,否则将导致重大问题。
-        if (TransactionSynchronizationManager.isActualTransactionActive()) {
-            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
-                @Override
-                public void afterCompletion(int status) {
-
-                    if(TransactionSynchronization.STATUS_COMMITTED == status){
-                        log.info("=========【销售单明细】======事务提交==============");
-                    }else if(TransactionSynchronization.STATUS_ROLLED_BACK == status){
-                        log.info("========【销售单明细】=========事务回滚============");
-                    }
 
-                    obtain.unlock();
-                }
-            });
-        } else {
-            log.info("【销售单明细】====没有事务===释放锁");
-            obtain.unlock();
-        }
-    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/MaterialGoodsStockCMapper.java

@@ -2,6 +2,7 @@ package com.gree.mall.manager.commonmapper;
 
 import com.gree.mall.manager.bean.material.stock.WebsitStockDTO;
 import com.gree.mall.manager.bean.material.stock.WorkerStockDTO;
+import com.gree.mall.manager.plus.entity.WebsitPartsSalesItem;
 import com.gree.mall.manager.plus.entity.WebsitStock;
 import com.gree.mall.manager.plus.entity.WorkerStock;
 import org.apache.ibatis.annotations.Param;
@@ -26,4 +27,15 @@ public interface MaterialGoodsStockCMapper {
     List<WorkerStock> queryExistWorkerStockList(@Param("companyWechatId") String companyWechatId,
                                                 @Param("workerId") String workerId,
                                                 @Param("stockList") List<WorkerStockDTO> stockList);
+
+    /**
+     * 带锁的查询
+     * @return
+     */
+    List<WebsitPartsSalesItem> querySalesItemByItemId(@Param("companyWechatId") String companyWechatId,
+                                                      @Param("websitId") String websitId,
+                                                      @Param("partsWebsitId") String partsWebsitId,
+                                                      @Param("identity") String identity,
+                                                      @Param("records") List<String> records);
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/MaterialMapper.java

@@ -322,12 +322,6 @@ public interface MaterialMapper {
     IPage<NewRefundManageVO> newRefundManagePage(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
-     * 带锁的查询
-     * @return
-     */
-    List<WebsitPartsSalesItem> querySalesItemByItemId(String websitId, String partsWebsitId, String identity, List<String> records);
-
-    /**
      * 旧件返还列表
      * @param page
      * @param zfireParamBean

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/MaterialGoodsStockLogic.java

@@ -41,6 +41,7 @@ public class MaterialGoodsStockLogic {
     private final WorkerStockService workerStockService;
     private final WorkerStockAccService workerStockAccService;
     private final WebsitPurchaseService websitPurchaseService;
+    private final WebsitPartsSalesItemService websitPartsSalesItemService;
 
     /**
      * 单个网点库存处理
@@ -289,4 +290,62 @@ public class MaterialGoodsStockLogic {
             obtain.unlock();
         }
     }
+
+    /**
+     * 恢复新件销售数量
+     * @param
+     */
+    public void revertNewPartsSalesQty(String companyId, String websitId, String partsWebsitId, String identity,
+                                       List<WebsitPartsNewRefundManageRecord> partsNewRefundManageRecordList) throws Exception {
+        // 锁定销售单明细
+        String lockName = websitId + "|" + partsWebsitId + "|" + identity;
+        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.WRITE_SALES_ITEM + lockName);
+        if(!obtain.tryLock(10, TimeUnit.SECONDS)){
+            throw new RemoteServiceException("销售明细已冻结:" + lockName);
+        }
+        // 处理销售单明细
+        try{
+            // 查询销售的明细
+            List<WebsitPartsSalesItem> salesOrderItems = materialGoodsStockCMapper.querySalesItemByItemId(companyId, websitId, partsWebsitId,
+                    identity, partsNewRefundManageRecordList.stream()
+                            .map(WebsitPartsNewRefundManageRecord::getSalesItemId)
+                            .collect(Collectors.toList()));
+
+            Map<String, WebsitPartsSalesItem> salesOrderItemMap = salesOrderItems.stream()
+                    .collect(Collectors.toMap(WebsitPartsSalesItem::getId, Function.identity()));
+            for (WebsitPartsNewRefundManageRecord partsNewRefundManageRecord : partsNewRefundManageRecordList) {
+                WebsitPartsSalesItem partsSalesOrderItem = salesOrderItemMap.get(partsNewRefundManageRecord.getSalesItemId());
+                partsSalesOrderItem.setNewRefundQty(partsSalesOrderItem.getNewRefundQty().subtract(partsNewRefundManageRecord.getQty()));
+                partsSalesOrderItem.setQty(partsSalesOrderItem.getQty().add(partsNewRefundManageRecord.getQty()));
+            }
+
+            // 更新销售明细数据
+            websitPartsSalesItemService.saveOrUpdateBatch(salesOrderItemMap.values());
+
+        } finally {
+            this.txCallUnlockSalesItem(obtain);
+        }
+    }
+
+    private void txCallUnlockSalesItem(Lock obtain) {
+        //事务提交完成后才释放锁,此方法禁止执行mysql相关操作,否则将导致重大问题。
+        if (TransactionSynchronizationManager.isActualTransactionActive()) {
+            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+                @Override
+                public void afterCompletion(int status) {
+
+                    if(TransactionSynchronization.STATUS_COMMITTED == status){
+                        log.info("=========【销售单明细】======事务提交==============");
+                    }else if(TransactionSynchronization.STATUS_ROLLED_BACK == status){
+                        log.info("========【销售单明细】=========事务回滚============");
+                    }
+
+                    obtain.unlock();
+                }
+            });
+        } else {
+            log.info("【销售单明细】====没有事务===释放锁");
+            obtain.unlock();
+        }
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/worker/NewRefundManageLogic.java

@@ -8,7 +8,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.material.stock.PartsStockLogic;
+import com.gree.mall.manager.bean.material.stock.WebsitStockDTO;
+import com.gree.mall.manager.bean.material.stock.WorkerStockDTO;
 import com.gree.mall.manager.bean.material.worker.NewRefundManageBean;
 import com.gree.mall.manager.bean.material.worker.NewRefundManageItemBean;
 import com.gree.mall.manager.bean.material.worker.NewRefundManageRecordBean;
@@ -16,29 +17,24 @@ import com.gree.mall.manager.bean.material.worker.NewRefundManageVO;
 import com.gree.mall.manager.commonmapper.MaterialMapper;
 import com.gree.mall.manager.enums.IsEnum;
 import com.gree.mall.manager.enums.base.BaseEnum;
-import com.gree.mall.manager.enums.material.PartsOrderFlagEnum;
-import com.gree.mall.manager.enums.material.PartsRefTypeEnum;
-import com.gree.mall.manager.enums.material.PartsRefundStateEnum;
-import com.gree.mall.manager.enums.material.PayTypeEnum;
+import com.gree.mall.manager.enums.material.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.WebsitPartsNewRefundManage;
-import com.gree.mall.manager.plus.entity.WebsitPartsNewRefundManageItem;
-import com.gree.mall.manager.plus.entity.WebsitPartsNewRefundManageRecord;
-import com.gree.mall.manager.plus.entity.WebsitPartsRefundRecord;
-import com.gree.mall.manager.plus.service.WebsitPartsNewRefundManageItemService;
-import com.gree.mall.manager.plus.service.WebsitPartsNewRefundManageRecordService;
-import com.gree.mall.manager.plus.service.WebsitPartsNewRefundManageService;
-import com.gree.mall.manager.plus.service.WebsitPartsRefundRecordService;
+import com.gree.mall.manager.logic.material.stock.MaterialGoodsStockLogic;
+import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -52,8 +48,9 @@ public class NewRefundManageLogic {
     private final WebsitPartsNewRefundManageService websitPartsNewRefundManageService;
     private final WebsitPartsNewRefundManageItemService websitPartsNewRefundManageItemService;
     private final WebsitPartsNewRefundManageRecordService websitPartsNewRefundManageRecordService;
-    private final PartsStockLogic partsStockLogic;
+    private final MaterialGoodsStockLogic materialGoodsStockLogic;
     private final WebsitPartsRefundRecordService websitPartsRefundRecordService;
+    private final StorageService storageService;
 
     public IPage<NewRefundManageVO> list(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
@@ -107,18 +104,18 @@ public class NewRefundManageLogic {
                     .eq(WebsitPartsNewRefundManageRecord::getApplyNo, partsNewRefundManage.getApplyNo())
                     .list();
             // 驳回状态时临占新件库存减 新件库存加
-//            List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsNewRefundManage, partsNewRefundManageItems,
-//                    partsNewRefundManage.getExamineBy(), partsNewRefundManage.getExamineTime(),
-//                    PartsStockPartsAttrEnum.TEMP_NEW.toString(), PartsStockPartsAttrEnum.NEW.toString());
-//            partsStockLogic.handleWorkerStock(workerStockDTOList);
-//            // 驳回状态时销售明细还原数量
-            partsStockLogic.revertNewPartsSalesQty(partsNewRefundManage.getReceiveWebsitId(), partsNewRefundManage.getReceivePartsWebsitId(),
+            List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsNewRefundManage, partsNewRefundManageItems,
+                    partsNewRefundManage.getExamineBy(), partsNewRefundManage.getExamineTime(),
+                    PartsAttrEnum.TEMP_NEW.getKey(), PartsAttrEnum.NEW.getKey());
+            materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
+            // 驳回状态时销售明细还原数量
+            materialGoodsStockLogic.revertNewPartsSalesQty(partsNewRefundManage.getCompanyWechatId(), partsNewRefundManage.getReceiveWebsitId(), partsNewRefundManage.getReceivePartsWebsitId(),
                     partsNewRefundManage.getIdentity(), partsNewRefundManageRecordList);
         }
     }
 
     @Transactional
-    public void refund(String applyNo) {
+    public void refund(String applyNo) throws Exception {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         WebsitPartsNewRefundManage partsNewRefundManage = websitPartsNewRefundManageService.getById(applyNo);
         if (!partsNewRefundManage.getFlag().equals(PartsOrderFlagEnum.AGREE.getKey())) {
@@ -135,14 +132,14 @@ public class NewRefundManageLogic {
         List<WebsitPartsNewRefundManageItem> partsNewRefundManageItems = websitPartsNewRefundManageItemService.lambdaQuery()
                 .eq(WebsitPartsNewRefundManageItem::getApplyNo, partsNewRefundManage.getApplyNo())
                 .list();
-//        List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsNewRefundManage, partsNewRefundManageItems,
-//                partsNewRefundManage.getRefundedBy(), partsNewRefundManage.getRefundedTime(),
-//                PartsStockPartsAttrEnum.TEMP_NEW.toString(), null);
-//        partsStockLogic.handleWorkerStock(workerStockDTOList);
+        List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsNewRefundManage, partsNewRefundManageItems,
+                partsNewRefundManage.getRefundedBy(), partsNewRefundManage.getRefundedTime(),
+                PartsAttrEnum.TEMP_NEW.getKey(), null);
+        materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
 
         // 增加网点新件库存
-//        List<ShopStockDTO> shopStockDTOList = this.createShopStockDTO(partsNewRefundManage, partsNewRefundManageItems);
-//        partsStockLogic.handleShopStock(shopStockDTOList);
+        List<WebsitStockDTO> shopStockDTOList = this.createWebsitStockDTO(partsNewRefundManage, partsNewRefundManageItems);
+        materialGoodsStockLogic.handleWebsitStock(shopStockDTOList);
 
         //TODO 插入退款记录
         List<WebsitPartsNewRefundManageRecord> partsNewRefundManageRecords = websitPartsNewRefundManageRecordService.lambdaQuery()
@@ -185,4 +182,107 @@ public class NewRefundManageLogic {
         }
         return partsRefundRecordList;
     }
+
+    private List<WorkerStockDTO> createWorkerStockDTO(WebsitPartsNewRefundManage partsNewRefundManage,
+                                                      List<WebsitPartsNewRefundManageItem> partsNewRefundManageItems,
+                                                      String operateBy, Date operateTime, String partsAttr1,
+                                                      String partsAttr2) {
+        List<WorkerStockDTO> workerStockDTOList = new ArrayList<>();
+
+        for (WebsitPartsNewRefundManageItem refundManageItem : partsNewRefundManageItems) {
+            // 新件
+            if (StringUtils.isNotBlank(partsAttr1)) {
+                WorkerStockDTO workerStockDTO = new WorkerStockDTO();
+                workerStockDTO.setCompanyWechatId(partsNewRefundManage.getCompanyWechatId());
+                workerStockDTO.setCompanyWechatName(partsNewRefundManage.getCompanyWechatName());
+                workerStockDTO.setIdentity(partsNewRefundManage.getIdentity());
+                workerStockDTO.setWorkerId(partsNewRefundManage.getWorkerId());
+                workerStockDTO.setWorkerName(partsNewRefundManage.getWorkerName());
+                workerStockDTO.setWebsitId(partsNewRefundManage.getReceiveWebsitId());
+                workerStockDTO.setWebsitName(partsNewRefundManage.getReceiveWebsitName());
+                workerStockDTO.setPartsWebsitId(partsNewRefundManage.getReceivePartsWebsitId());
+                workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsId(refundManageItem.getPartsNumber());
+                workerStockDTO.setGoodsName(refundManageItem.getPartsName());
+                workerStockDTO.setMaterialGroupName(refundManageItem.getMaterialGroupName());
+                workerStockDTO.setGoodsStockUnit(refundManageItem.getGoodsStockUnit());
+                workerStockDTO.setPrice(BigDecimal.ZERO);
+                workerStockDTO.setRef(partsNewRefundManage.getApplyNo());
+                workerStockDTO.setRefType(PartsRefTypeEnum.NEW_REFUND.getKey());
+                workerStockDTO.setPartsAttr(partsAttr1);
+                workerStockDTO.setChangeQty(refundManageItem.getQty());
+                workerStockDTO.setDirectFlag(DirectFlagEnum.SUB.getKey());
+                workerStockDTO.setRemark(refundManageItem.getRemark());
+                workerStockDTO.setOperateBy(operateBy);
+                workerStockDTO.setOperateTime(operateTime);
+
+                workerStockDTOList.add(workerStockDTO);
+            }
+            if (StringUtils.isNotBlank(partsAttr2)) {
+                WorkerStockDTO workerStockDTO = new WorkerStockDTO();
+                workerStockDTO.setCompanyWechatId(partsNewRefundManage.getCompanyWechatId());
+                workerStockDTO.setCompanyWechatName(partsNewRefundManage.getCompanyWechatName());
+                workerStockDTO.setIdentity(partsNewRefundManage.getIdentity());
+                workerStockDTO.setWorkerId(partsNewRefundManage.getWorkerId());
+                workerStockDTO.setWorkerName(partsNewRefundManage.getWorkerName());
+                workerStockDTO.setWebsitId(partsNewRefundManage.getReceiveWebsitId());
+                workerStockDTO.setWebsitName(partsNewRefundManage.getReceiveWebsitName());
+                workerStockDTO.setPartsWebsitId(partsNewRefundManage.getReceivePartsWebsitId());
+                workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsId(refundManageItem.getPartsNumber());
+                workerStockDTO.setGoodsName(refundManageItem.getPartsName());
+                workerStockDTO.setMaterialGroupName(refundManageItem.getMaterialGroupName());
+                workerStockDTO.setGoodsStockUnit(refundManageItem.getGoodsStockUnit());
+                workerStockDTO.setPrice(BigDecimal.ZERO);
+                workerStockDTO.setRef(partsNewRefundManage.getApplyNo());
+                workerStockDTO.setRefType(PartsRefTypeEnum.NEW_REFUND.getKey());
+                workerStockDTO.setPartsAttr(partsAttr2);
+                workerStockDTO.setChangeQty(refundManageItem.getQty());
+                workerStockDTO.setDirectFlag(DirectFlagEnum.ADD.getKey());
+                workerStockDTO.setRemark(refundManageItem.getRemark());
+                workerStockDTO.setOperateBy(operateBy);
+                workerStockDTO.setOperateTime(operateTime);
+
+                workerStockDTOList.add(workerStockDTO);
+            }
+        }
+
+        return workerStockDTOList;
+    }
+
+    private List<WebsitStockDTO> createWebsitStockDTO(WebsitPartsNewRefundManage partsNewRefundManage, List<WebsitPartsNewRefundManageItem> partsNewRefundManageItems) {
+        List<WebsitStockDTO> shopStockDTOList = new ArrayList<>();
+        final Storage storage = storageService.lambdaQuery()
+                .eq(Storage::getCompanyWechatId, partsNewRefundManage.getCompanyWechatId())
+                .in(Storage::getWebsitId, partsNewRefundManage.getReceiveWebsitId())
+                .eq(Storage::getIsDefault, IsEnum.Y.getValue())
+                .one();
+
+        for (WebsitPartsNewRefundManageItem partsNewRefundManageItem : partsNewRefundManageItems) {
+            WebsitStockDTO websitStockDTO = new WebsitStockDTO();
+            websitStockDTO.setCompanyWechatId(partsNewRefundManage.getCompanyWechatId());
+            websitStockDTO.setCompanyWechatName(partsNewRefundManage.getCompanyWechatName());
+            websitStockDTO.setWebsitId(partsNewRefundManage.getReceiveWebsitId());
+            websitStockDTO.setWebsitName(partsNewRefundManage.getReceiveWebsitName());
+            websitStockDTO.setSdate(partsNewRefundManage.getRefundedTime());
+            websitStockDTO.setPartsWebsitId(partsNewRefundManage.getReceivePartsWebsitId());
+            websitStockDTO.setGoodsId(partsNewRefundManageItem.getPartsNumber());
+            websitStockDTO.setGoodsName(partsNewRefundManageItem.getPartsName());
+            websitStockDTO.setPrice(BigDecimal.ZERO);
+            websitStockDTO.setMaterialGroupName(partsNewRefundManageItem.getMaterialGroupName());
+            websitStockDTO.setGoodsStockUnit(partsNewRefundManageItem.getGoodsStockUnit());
+            websitStockDTO.setVoucherNo(partsNewRefundManage.getApplyNo());
+            websitStockDTO.setApplyNo(partsNewRefundManage.getApplyNo());
+            websitStockDTO.setObj(BaseEnum.keyToEnumNotNull(PartsRefundApplyTypeEnum.class, partsNewRefundManage.getApplyType()).getRemark());
+            websitStockDTO.setPartsAttr(PartsAttrEnum.NEW.toString());
+            websitStockDTO.setChangeQty(partsNewRefundManageItem.getQty());
+            websitStockDTO.setDirectFlag(DirectFlagEnum.ADD.getKey());
+            websitStockDTO.setRemark(partsNewRefundManageItem.getRemark());
+            websitStockDTO.setOperateBy(partsNewRefundManage.getRefundedBy());
+            websitStockDTO.setOperateTime(partsNewRefundManage.getRefundedTime());
+            websitStockDTO.setStorageId(storage.getStorageId());
+            shopStockDTOList.add(websitStockDTO);
+        }
+        return shopStockDTOList;
+    }
 }

mall-server-api/src/main/resources/mapper/MaterialGoodsStockCMapper.xml

@@ -38,4 +38,22 @@
         </foreach>
         FOR UPDATE
     </select>
+
+    <select id="querySalesItemByItemId" resultType="com.gree.mall.manager.plus.entity.WebsitPartsSalesItem">
+        SELECT
+        a.*
+        FROM
+        websit_parts_sales_item a
+        WHERE
+            a.company_wechat_id = #{companyWechatId}
+            AND a.identity = #{identity}
+            AND a.websit_id = #{websitId}
+            AND a.parts_websit_id = #{partsWebsitId}
+            AND a.id IN
+            <foreach item="item" index="index" collection="records" open="(" separator=","
+                     close=")">
+                #{item}
+            </foreach>
+        FOR UPDATE
+    </select>
 </mapper>

mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -682,23 +682,6 @@
         ${ex.orderBy}
     </select>
 
-    <select id="querySalesItemByItemId" resultType="com.gree.mall.manager.plus.entity.WebsitPartsSalesItem">
-        SELECT
-            a.*
-        FROM
-            websit_parts_sales_item a
-        WHERE
-            a.identity = #{identity}
-            AND a.websit_id = #{websitId}
-            AND a.parts_websit_id = #{partsWebsitId}
-            AND a.id IN
-        <foreach item="item" index="index" collection="records" open="(" separator=","
-                 close=")">
-            #{item}
-        </foreach>
-        FOR UPDATE
-    </select>
-
     <select id="oldRefundManagePage" resultType="com.gree.mall.manager.bean.material.worker.OldRefundManageVO">
         SELECT
             ${ex.selected}