搜索，代码整合

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/jd/JdOrderController.java

@@ -137,16 +137,22 @@ public class JdOrderController {
     @PostMapping("/tellBackOrer")
     public void tellBackOrer(@RequestBody JdOrderDto jdOrderDto){
         //参数校验
-        if(ObjectUtil.isNull(jdOrderDto.getOrderId()) || ObjectUtil.isNull(jdOrderDto.getDeliveryTime())){
+        if(ObjectUtil.isNull(jdOrderDto.getOrderId()) || ObjectUtil.isNull(jdOrderDto.getId())){
             throw new RuntimeException("参数错误");
         }
+        if(ObjectUtil.isNull(jdOrderDto.getDeliveryTime())){
+            throw new RuntimeException("预计送达时间不能为空");
+        }
         List<JdOrderDetails> jdOrderDetailsList = jdOrderDto.getJdOrderDetailsList();
         if(CollectionUtil.isEmpty(jdOrderDetailsList)){
-            throw new RuntimeException("参数错误");
+            throw new RuntimeException("采购单明细不能为空");
         }
         for (JdOrderDetails jdOrderDetails : jdOrderDetailsList) {
+            if(ObjectUtil.isNull(jdOrderDetails.getWareId())){
+                throw new RuntimeException("京东商品编号为空");
+            }
             if(ObjectUtil.isNull(jdOrderDetails.getConfirmNum())){
-                throw new RuntimeException("参数错误");
+                throw new RuntimeException("京东商品编号："+jdOrderDetails.getWareId()+"确认数量为空");
             }
         }
         jdOrderService.tellBackOrer(jdOrderDto);

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

@@ -676,11 +676,11 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
     @Transactional(rollbackFor = Exception.class)
     public void tellBackOrer(JdOrderDto jdOrderDto) {
         TellBackOrderVO tellBackOrderVO = new TellBackOrderVO();
-        tellBackOrderVO.setOrderId(123L);
+        tellBackOrderVO.setOrderId(jdOrderDto.getOrderId());
         tellBackOrderVO.setDeliveryTime(jdOrderDto.getDeliveryTime());
         List<TellBackOrderVO.BackInfo> backInfos = BeanUtil.copyToList(jdOrderDto.getJdOrderDetailsList(), TellBackOrderVO.BackInfo.class);
         tellBackOrderVO.setBackInfo(backInfos);
-        jdApiService.tellBackOrer(tellBackOrderVO);
+//        jdApiService.tellBackOrer(tellBackOrderVO);
         //修改订单状态
         lambdaUpdate()
                 .set(JdOrder::getBusinessStatus, 2)