1018653686@qq.com 1 жил өмнө
parent
commit
dafe46f20d

+ 16 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -2,6 +2,7 @@ package com.fjhx.victoriatourist.service.jd.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
@@ -709,6 +710,21 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
                 stockWaitDetailsList.add(stockWaitDetails);
             }
             stockWaitDetailsService.saveBatch(stockWaitDetailsList);
+        }else {
+            //无需出库直接回告
+            JdOrderDto tellBackDto = new JdOrderDto();
+            tellBackDto.setId(jdOrder.getId());
+            tellBackDto.setDeliveryTime(DateUtil.date());
+            List<JdOrderDetails> jdOrderDetailsList = new ArrayList<>();
+            List<JdOrderDetailsVo> jdOrderDetailsVoList = jdOrderDetailsService.findListByJdOrderId(jdOrderDto.getId());
+            for (JdOrderDetailsVo jdOrderDetailsVo : jdOrderDetailsVoList) {
+                JdOrderDetails jdOrderDetails = new JdOrderDetails();
+                jdOrderDetails.setWareId(jdOrderDetailsVo.getWareId());
+                jdOrderDetails.setConfirmNum(jdOrderDetailsVo.getActualNum());
+                jdOrderDetailsList.add(jdOrderDetails);
+            }
+            tellBackDto.setJdOrderDetailsList(jdOrderDetailsList);
+            tellBackOrer(jdOrderDto);
         }
         DynamicDataSourceContextHolder.poll();