Merge remote-tracking branch 'origin/dev' into dev

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -45,13 +45,13 @@ import java.util.*;
 @Service
 public class AuthServiceImpl implements IAuthService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteUserService remoteUserService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService systemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private SmsInfoService smsInfoService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -22,7 +22,7 @@ import java.util.*;
  * @desc 合同远程接口实现
  * @date 2023/7/31
  */
-@DubboService(group = "design", version = "2.0.0")
+@DubboService(group = "design", version = "1.0.0")
 public class RemoteContractServiceImpl implements RemoteContractService {
 
     @Autowired

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/CommonBusinessService.java

@@ -24,10 +24,10 @@ import java.util.Objects;
 @Service
 public class CommonBusinessService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
 
     @Autowired

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsGoodsService.java

@@ -33,7 +33,7 @@ public class KwcContractLogisticsGoodsService {
     @Autowired
     private KwcContractLogisticsGoodsMapper kwcContractLogisticsGoodsMapper;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private GoodsInfoService goodsInfoService;
 
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -72,10 +72,10 @@ public class KwcContractLogisticsService {
     private RemoteContractServiceImpl remoteContractService;
 
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private GoodsInfoService goodsInfoService;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsTrackService.java

@@ -40,7 +40,7 @@ public class KwcContractLogisticsTrackService {
     @Autowired
     private KwcContractLogisticsUnitMapper kwcContractLogisticsUnitMapper;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -64,13 +64,13 @@ public class KwcContractTradeService {
     @Autowired
     private KwcContractTradeUnitService kwcContractTradeUnitService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private GoodsInfoService goodsInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeTrackService.java

@@ -39,7 +39,7 @@ public class KwcContractTradeTrackService {
     @Autowired
     private KwcContractTradeUnitMapper kwcContractTradeUnitMapper;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     public void saveContractTradeTrack(Long contractId) {

sckw-modules/sckw-example/src/main/java/com/sckw/example/controller/MessageApiController.java

@@ -20,10 +20,10 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value = "/messageApi")
 @RequiredArgsConstructor
 public class MessageApiController {
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private SmsInfoService smsInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
 
     @GetMapping("/getVerifyCode")

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/dubbo/FileDubboApiService.java

@@ -30,7 +30,7 @@ import java.util.Map;
  */
 
 @Slf4j
-@DubboService(group = "design", version = "2.0.0",timeout = 50000)
+@DubboService(group = "design", version = "1.0.0",timeout = 50000)
 public class FileDubboApiService implements FileApiDubboService {
 
     @Autowired

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -51,7 +51,7 @@ public class KwfDriverService {
     KwfDriverQualificationMapper KwfDriverQualificationDao;
     @Autowired
     KwfFleetDriverMapper fleetDriverDao;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfFleetService.java

@@ -34,7 +34,7 @@ public class KwfFleetService {
 
     @Autowired
     KwfFleetMapper fleetDao;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckReportService.java

@@ -53,7 +53,7 @@ public class KwfTruckReportService {
     KwfDriverService driverService;
     @Autowired
     KwfTruckService truckService;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**
@@ -503,8 +503,8 @@ public class KwfTruckReportService {
         }
         //字符截取-英文逗号/中文逗号
         String[] strArray = str.split(Global.COMMA1);
-        strArray = (strArray == null || strArray.length == 0) ? str.split(Global.COMMA) : strArray;
-        if (strArray == null || strArray.length == 0 || strArray.length != 5 ) {
+        strArray = (strArray == null || strArray.length <= 1) ? str.split(Global.COMMA) : strArray;
+        if (strArray == null || strArray.length <= 1 || strArray.length != 5 ) {
             return null;
         }
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -46,7 +46,7 @@ public class KwfTruckService {
     KwfTransportLicenseMapper transportLicenseDao;
     @Autowired
     KwfFleetTruckMapper fleetTruckDao;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverMapper.xml

@@ -102,7 +102,7 @@
             and DATE( dr.create_time ) <![CDATA[ <= ]]> #{endTime,jdbcType=TIMESTAMP}
         </if>
         <choose>
-            <when test="ids != null">
+            <when test="ids != null and ids != '' ">
                 and dr.id in
                 <foreach collection="ids" item="id" open="(" close=")" separator=",">
                     #{id,jdbcType=BIGINT}
@@ -152,7 +152,7 @@
             )
         </if>
         <choose>
-            <when test="ids != null">
+            <when test="ids != null and ids != '' ">
                 and dr.id in
                 <foreach collection="ids" item="id" open="(" close=")" separator=",">
                     #{id,jdbcType=BIGINT}

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckMapper.xml

@@ -157,7 +157,7 @@
             and DATE( tr.create_time ) <![CDATA[ <= ]]> #{endTime,jdbcType=TIMESTAMP}
         </if>
         <choose>
-            <when test="truckNos != null">
+            <when test="truckNos != null and truckNos != ''">
                 and tr.truck_no in
                 <foreach collection="truckNos" item="truckNo" open="(" close=")" separator=",">
                     #{truckNo,jdbcType=VARCHAR}

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/dubbo/RemoteManageServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  * @desc 基础信息+合作管理远程接口实现
  * @date 2023/7/31
  */
-@DubboService(group = "design", version = "2.0.0")
+@DubboService(group = "design", version = "1.0.0")
 public class RemoteManageServiceImpl implements RemoteManageService {
 
     @Autowired

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/CommonBusinessService.java

@@ -36,10 +36,10 @@ import java.util.stream.Collectors;
 @Service
 public class CommonBusinessService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteUserService remoteUserService;
 
     @Autowired

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateApplyService.java

@@ -61,7 +61,7 @@ public class KwmCooperateApplyService {
     @Autowired
     private KwmCooperateTypeMapper kwmCooperateTypeMapper;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
     /**

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateManageService.java

@@ -58,7 +58,7 @@ public class KwmCooperateManageService {
     @Autowired
     private CommonBusinessService commonBusinessService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
 

sckw-modules/sckw-message/src/main/java/com/sckw/message/dubbo/SmsInfoServiceImpl.java

@@ -10,7 +10,7 @@ import org.apache.dubbo.config.annotation.DubboService;
  * @author: yzc
  * @date: 2023-06-13 14:10
  */
-@DubboService(group = "design", version = "2.0.0")
+@DubboService(group = "design", version = "1.0.0")
 public class SmsInfoServiceImpl implements SmsInfoService {
     @Override
     public String getVerifyCode(String type, String phone) {

sckw-modules/sckw-order/src/main/java/com/sckw/order/dubbo/TradeOrderInfoServiceImpl.java

@@ -36,7 +36,7 @@ import java.util.Objects;
  * @author: yzc
  * @date: 2023-07-18 18:26
  */
-@DubboService(group = "design", version = "2.0.0")
+@DubboService(group = "design", version = "1.0.0")
 @Slf4j
 public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -58,19 +58,19 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class KwoTradeOrderService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private GoodsInfoService goodsInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteContractService remoteContractService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private PayCenterDubboService payCenterDubboService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private TransportDubboService transportDubboService;
 
     private final KwoTradeOrderMapper kwoTradeOrderMapper;

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwpWantBuyService.java

@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RequiredArgsConstructor
 public class KwpWantBuyService {
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     private final KwpWantBuyMapper kwpWantBuyMapper;
     private final KwpWantBuyTradingMapper kwpWantBuyTradingMapper;

sckw-modules/sckw-product/src/main/java/com/sckw/product/dubbo/GoodsInfoServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
  * @author: yzc
  * @date: 2023-07-13 14:17
  */
-@DubboService(group = "design", version = "2.0.0")
+@DubboService(group = "design", version = "1.0.0")
 @Slf4j
 public class GoodsInfoServiceImpl implements GoodsInfoService {
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -57,13 +57,13 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class KwpGoodsService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteUserService remoteUserService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private PayCenterDubboService payCenterDubboService;
 
     private final KwpGoodsMapper kwpGoodsMapper;

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -63,10 +63,10 @@ public class KwTransportService {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     TransportDubboService transportDubboService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
  * @desc 远程接口
  * @date 2023/6/12
  */
-@DubboService(group = "design", version = "2.0.0")
+@DubboService(group = "design", version = "1.0.0")
 public class RemoteSystemServiceImpl implements RemoteSystemService {
 
     @Autowired

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
  * @date 2023/6/12
  */
 
-@DubboService(group = "design", version = "2.0.0")
+@DubboService(group = "design", version = "1.0.0")
 public class RemoteUserServiceImpl implements RemoteUserService {
 
     @Resource

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillVO.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -20,21 +21,25 @@ public class CarWaybillVO {
     /**
      * 物流订单id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
 
     /**
      *物流订单编号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**
      * 车辆运单id
      */
+    @JsonProperty("wOrderId")
     private String wOrderId;
 
     /**
      * 运单编号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
     /**
      * 车牌号

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/DriverListVo.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -55,15 +56,18 @@ public class DriverListVo {
     /**
      * 物流订单id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
 
     /**
      * 车辆运单id
      */
+    @JsonProperty("wOrderId")
     private String wOrderId;
 
     /**
      * 车辆运单编号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillBoardListVO.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -17,10 +18,12 @@ public class WaybillBoardListVO {
     /**
      * 运单Id
      */
+    @JsonProperty("wOrderId")
     private String wOrderId;
     /**
      * 运单号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
 
     /**
@@ -98,6 +101,11 @@ public class WaybillBoardListVO {
      */
     private String truckNo;
 
+    /**
+     * 循环/趟次
+     */
+    private String type;
+
     /**
      * 装载重量
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderDriverVo.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -15,21 +16,25 @@ public class WaybillOrderDriverVo {
     /**
      * 主键
      */
+    @JsonProperty("wOrderId")
     private Long wOrderId;
 
     /**
      * 编号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
 
     /**
      * 主键
      */
+    @JsonProperty("lOrderId")
     private Long lOrderId;
 
     /**
      * 物流订单编号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderVO.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -16,31 +17,37 @@ public class WaybillOrderVO {
     /**
      * 主键
      */
+    @JsonProperty("wOrderId")
     private Long wOrderId;
 
     /**
      * 编号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
 
     /**
      * 主键
      */
+    @JsonProperty("lOrderId")
     private Long lOrderId;
 
     /**
      * 物流订单编号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**
      * 交易订单id（kwo_trade_order）
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 交易订单编号（kwo_trade_order）
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -63,21 +63,21 @@ import java.util.stream.Collectors;
 @Service
 public class AcceptCarriageOrderService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     RemoteSystemService remoteSystemService;
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     TradeOrderInfoService tradeOrderInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     GoodsInfoService goodsInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     RemoteFleetService fleetService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteContractService remoteContractService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteManageService remoteManageService;
 
     @Resource
@@ -889,21 +889,22 @@ public class AcceptCarriageOrderService {
         List<Long> wOrderIds = logisticsOrderCirculateMapper.selectEntityBylOrderIdAndOrderIds(stopOrderTakingDTO.getLOrderId(), stringList);
         List<JSONObject> list = new ArrayList<>(stringList.size());
         String type = stopOrderTakingDTO.getType();
-        if (String.valueOf(NumberConstant.TWO).equals(type)){
-            acceptStopDocumentCommit(stopOrderTakingDTO,list,wOrderIds);
-        }else if (String.valueOf(NumberConstant.ONE).equals(type)){
-            consignStopDocumentCommit(stopOrderTakingDTO,list,wOrderIds);
-        }else {
-           return HttpResult.error("单据类型错误!");
+        if (String.valueOf(NumberConstant.TWO).equals(type)) {
+            acceptStopDocumentCommit(stopOrderTakingDTO, list, wOrderIds);
+        } else if (String.valueOf(NumberConstant.ONE).equals(type)) {
+            consignStopDocumentCommit(stopOrderTakingDTO, list, wOrderIds);
+        } else {
+            return HttpResult.error("单据类型错误!");
         }
         return HttpResult.ok(list);
     }
 
     /**
      * 托运订单-设置停止接单
+     *
      * @param stopOrderTakingDTO
      */
-    private void consignStopDocumentCommit(StopOrderTakingDTO stopOrderTakingDTO,List<JSONObject> list,List<Long> wOrderIds) {
+    private void consignStopDocumentCommit(StopOrderTakingDTO stopOrderTakingDTO, List<JSONObject> list, List<Long> wOrderIds) {
 
         if (CollectionUtils.isNotEmpty(wOrderIds)) {
             wOrderIds.forEach(wOrderId -> {
@@ -916,11 +917,11 @@ public class AcceptCarriageOrderService {
                 } else {
                     logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
                             .set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE)
-                            .set(KwtLogisticsOrderCirculate::getUpdateBy,LoginUserHolder.getUserId())
-                            .set(KwtLogisticsOrderCirculate::getUpdateTime,new Date())
+                            .set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId())
+                            .set(KwtLogisticsOrderCirculate::getUpdateTime, new Date())
                             .eq(KwtLogisticsOrderCirculate::getWOrderId, wOrderId)
                     );
-//                    /**更新MongoDB*/
+                    /**更新MongoDB*/
                     SckwWaybillOrder order = new SckwWaybillOrder();
                     order.setStatus(NumberConstant.ONE);
                     order.setUpdateTime(new Date());
@@ -941,9 +942,10 @@ public class AcceptCarriageOrderService {
 
     /**
      * 承运订单设置停止接单
+     *
      * @param stopOrderTakingDTO
      */
-    private void acceptStopDocumentCommit(StopOrderTakingDTO stopOrderTakingDTO,List<JSONObject> list,List<Long> wOrderIds) {
+    private void acceptStopDocumentCommit(StopOrderTakingDTO stopOrderTakingDTO, List<JSONObject> list, List<Long> wOrderIds) {
         if (CollectionUtils.isNotEmpty(wOrderIds)) {
             wOrderIds.forEach(wOrderId -> {
                 JSONObject jsonObject = new JSONObject();
@@ -955,8 +957,8 @@ public class AcceptCarriageOrderService {
                 } else {
                     logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
                             .set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE)
-                            .set(KwtLogisticsOrderCirculate::getUpdateBy,LoginUserHolder.getUserId())
-                            .set(KwtLogisticsOrderCirculate::getUpdateTime,new Date())
+                            .set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId())
+                            .set(KwtLogisticsOrderCirculate::getUpdateTime, new Date())
                             .eq(KwtLogisticsOrderCirculate::getWOrderId, wOrderId)
                     );
 //                    /**更新MongoDB*/
@@ -1699,4 +1701,5 @@ public class AcceptCarriageOrderService {
         order.setUpdateTime(new Date());
         logisticsOrderMapper.insert(order);
     }
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ConsignOrderService.java

@@ -54,15 +54,15 @@ import java.util.stream.Collectors;
 @Service
 public class ConsignOrderService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteContractService remoteContractService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     GoodsInfoService goodsInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteFleetService remoteFleetService;
 
     @Autowired

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/DriverService.java

@@ -48,10 +48,10 @@ import java.util.stream.Collectors;
 @Service
 public class DriverService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteFleetService remoteFleetService;
 
     @Autowired

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -71,11 +71,11 @@ public class KwtWaybillOrderService {
     KwtLogisticsOrderCirculateMapper logisticsOrderCirculateDao;
     @Resource
     private StreamBridge streamBridge;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteFleetService remoteFleetService;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -66,19 +66,19 @@ public class LogisticsConsignmentService {
     @Resource
     private StreamBridge streamBridge;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     GoodsInfoService goodsInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     TradeOrderInfoService tradeOrderInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteFleetService remoteFleetService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteContractService remoteContractService;
 
     @Autowired

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java

@@ -53,13 +53,13 @@ import java.util.stream.Collectors;
 @Service
 public class TransportCommonService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 10000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 10000)
     RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     TradeOrderInfoService tradeOrderInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteContractService remoteContractService;
 
     @Autowired

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -7,7 +7,6 @@ import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.FileUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
@@ -52,7 +51,7 @@ public class WaybillManagementService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteFleetService remoteFleetService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
     @Autowired
@@ -238,6 +237,7 @@ public class WaybillManagementService {
             waybillBoardListVO.setWOrderId(String.valueOf(sckwWaybillOrder.getWOrderId()));
             waybillBoardListVO.setWOrderNo(String.valueOf(sckwWaybillOrder.getWOrderNo()));
             waybillBoardListVO.setStatus(String.valueOf(sckwWaybillOrder.getStatus()));
+            waybillBoardListVO.setType(String.valueOf(sckwWaybillOrder.getType()));
             waybillBoardListVO.setStatusLabel(CarWaybillEnum.getName(sckwWaybillOrder.getStatus()));
             waybillBoardListVO.setGoodsName(String.valueOf(sckwWaybillOrder.getGoodsName()));
             waybillBoardListVO.setLoadName(sckwWaybillOrder.getLoadName());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

@@ -48,13 +48,13 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-@DubboService(group = "design", version = "2.0.0", timeout = 50000)
+@DubboService(group = "design", version = "1.0.0", timeout = 50000)
 public class TransportDubboServiceImpl implements TransportDubboService {
 
     @Resource
     private StreamBridge streamBridge;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
     @Autowired