接单bugfix

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/DateUtils.java

@@ -103,6 +103,21 @@ public class DateUtils extends DateUtil {
         return null;
     }
 
+
+    /**
+     * 日期格式化 日期格式为：yyyy-MM-dd
+     *
+     * @param date    日期
+     * @return 返回yyMMdd格式日期
+     */
+    public static String formatDate(Date date) {
+        if (date != null) {
+            SimpleDateFormat df = new SimpleDateFormat(FORMAT8);
+            return df.format(date);
+        }
+        return null;
+    }
+
     /**
      * @param date
      * @return String    返回类型

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/OrderGenerateUtils.java

@@ -26,6 +26,12 @@ public class OrderGenerateUtils {
     private static final String ORDER_NO_GENERATOR = "order_no_generator:";
 
 
+    /**
+     * redisson生成订单号 name（物流订单）
+     */
+    private static final String LOGISTICS_ORDER_NO_GENERATOR = "logistics_order_no_generator:";
+
+
     /**
      * @desc: 生成订单号
      * @author: yzc
@@ -48,4 +54,29 @@ public class OrderGenerateUtils {
         return SDF.format(new Date());
     }
 
+    /**
+     * 字符串格式化长度不足补0
+     */
+    public static String addZeroForNum(String str, int strLength) {
+        int strLen = str.length();
+        if (strLen < strLength) {
+            StringBuffer sb = new StringBuffer(str);
+            while (strLen < strLength) {
+                // 左补0
+                sb.insert(0, "0");
+                strLen = sb.length();
+            }
+            str = sb.toString();
+        }
+        return str;
+    }
+
+    public static void main(String[] args) {
+        getLogisticsLOrderNo("T","1","1","1");
+    }
+    public static void getLogisticsLOrderNo(String t, String number, String number1, String number2) {
+        StringBuilder str=new StringBuilder();
+        String date = DateUtils.formatDate(new Date());
+        str.append(t).append(date).append(number).append(number1).append(number2);
+    }
 }

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

@@ -15,10 +15,7 @@ import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
-import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.IdWorker;
-import com.sckw.core.utils.RegularUtils;
-import com.sckw.core.utils.StringUtils;
+import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
@@ -57,6 +54,8 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.sckw.transport.utils.StringUtils.getLOrderNo;
+
 /**
  * @author lfdc
  * @description 承运订单service
@@ -167,7 +166,7 @@ public class AcceptCarriageOrderService {
             order.setSubcontractAmount(new BigDecimal(NumberConstant.ZERO));
             order.setUnit(bo.getCarryingCapacityUnit());
         }
-        String lOrderNo = com.sckw.transport.utils.StringUtils.getLOrderNo();
+        String lOrderNo = getLOrderNo();
         Long orderId = new IdWorker(NumberConstant.ONE).nextId();
         /**分包托运需要判断处于哪一级分包托运
          * 需要记录当前分包数据-分包上游数据
@@ -602,8 +601,10 @@ public class AcceptCarriageOrderService {
         KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                 .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
                 .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
-                .eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId()));
+                /*.eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId())*/
+        );
         if (logisticsOrder == null) {
+            result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             result.setMsg("单据不存在!");
             return result;
         }
@@ -1508,7 +1509,8 @@ public class AcceptCarriageOrderService {
         /**保存新建数据*/
         Long lOrderId = new IdWorker(NumberConstant.ONE).nextId();
         /**生成订单编号*/
-        String lOrderNo = com.sckw.transport.utils.StringUtils.getLOrderNo();
+        String lOrderNo = getLOrderNo();
+//        getLogisticsLOrderNo("T","0","0","1");
         /**根据合同计算当前单据状态*/
         /**判断生成物流订单应生成哪一种单据状态*/
         List<Long> contractList = new ArrayList<>();