feat: 下单接口数据补全；

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillOrderServiceImpl.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.redis.service.RedisIdGenerator;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.logistics.enums.OrderStatusEnum;
 import com.ruoyi.logistics.service.LogisticsOrderService;
 import com.ruoyi.system.api.model.LoginUser;
 import org.checkerframework.checker.units.qual.A;
@@ -72,6 +73,7 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String orderId = redisIdGenerator.generateUniqueId("RJSD");
         bizWaybillOrder.setWaybillNo(orderId);
+        bizWaybillOrder.setOrderStatus(OrderStatusEnum.ORDER_STATUS_1.getCode());
         //前置校验
         JSONObject jsonObject= logisticsOrderService.precheckOrder(bizWaybillOrder);
         if(!jsonObject.getBooleanValue("success")){
@@ -81,6 +83,7 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
         if(!orderObject.getBooleanValue("success")){
             throw new ServiceException("下单失败！ 原因:"+orderObject.getString("msg"));
         }
+        bizWaybillOrder.setExternalWaybillNo(orderObject.getString("data"));
         bizWaybillOrder.setCreateTime(DateUtils.getNowDate());
         bizWaybillOrder.setUserId(loginUser.getUserid());
         bizWaybillOrder.setDeptId(loginUser.getSysUser().getDeptId());

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/JDLogisticsService.java

@@ -168,6 +168,8 @@ public class JDLogisticsService  implements LogisticsService {
 
             if (response.getCode().equals("0")) {
                 result.put("success", true);
+                // 返回京东物流单号
+                result.put("data", response.getResult().getData().getWaybillCode());
                 result.put("msg", "");
             } else {
                 result.put("success", false);