huanglizhi hai 1 ano
pai
achega
ce1bd9991c

+ 4 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java

@@ -221,6 +221,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
             detailDO.setLockedTime(new Date());
             detailDOS.add(detailDO);
         }
+        lockedStockDetailManager.remove(new LambdaQueryWrapper<LockedStockDetailDO>().eq(LockedStockDetailDO::getOrderId,id));
         lockedStockDetailManager.saveBatch(detailDOS);
         productStockManager.updateLockedStock(arrayList);
         aDo.setStatus(SaleOrderStatusEnum.TO_BE_SEND);
@@ -346,7 +347,9 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
         List<LockedStockDetailDO> detailDOS = new ArrayList<>();
         for (OrderSendItemVO sendItemVO : list) {
             LockedStockDetailDO one = lockedStockDetailManager.getOne(new LambdaQueryWrapper<LockedStockDetailDO>()
-                    .eq(LockedStockDetailDO::getOrderId, orderDO.getId()).eq(LockedStockDetailDO::getOrderItemId, sendItemVO.getOrderItemId()));
+                    .eq(LockedStockDetailDO::getOrderId, orderDO.getId())
+                    .eq(LockedStockDetailDO::getOrderItemId, sendItemVO.getOrderItemId())
+                    .last("limit 1"));
             if (ObjectUtil.isNull(one)) {
                 throw new ServiceException("未找到冻结记录");
             }

+ 1 - 1
module-erp/src/main/java/com/hys/app/service/kuaidiniao/KuaiDiNiaoServiceImpl.java

@@ -130,7 +130,7 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
         Long modelId = createStoreModel.getId();
         createStoreModel.setId(null);
         fillParam(createStoreModel);
-        CreateStoreModel createStoreModel2 = BeanUtil.copyProperties(createStoreModel, CreateStoreModel.class);
+        CreateStoreModel2 createStoreModel2 = BeanUtil.copyProperties(createStoreModel, CreateStoreModel2.class);
         try {
             String design = URLEncoder.encode(Base64.encode(DigestUtil.md5Hex(JSONUtil.toJsonStr(createStoreModel2) + apiKey)), "UTF-8");
             System.out.println("创建店铺签名--------------------------------------" + design);