开发：修改BUG

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -109,8 +109,13 @@ public class GoodsOrderController {
                 }
                 long beginOrderGoodsId = orderGoodsIdGenerate.getOrderGoodsId(OrderGoodsTypeEnum.Status.PLATFORM.getCode(), childParamsList.size());
                 for (OrderGoodsChildParams child : childParamsList) {
-                    if (child.getPendingOrderWay().equals(2) && child.getNeedTruckNum() == null) {
-                        throw new RuntimeException("定向派单必须选择车辆");
+                    if (child.getPendingOrderWay().equals(2) ) {
+                        if (child.getNeedTruckNum() == null){
+                            throw new RuntimeException("定向派单必须选择车辆");
+                        }
+                        if (child.getNeedTruckNum() != child.getTruckList().size()){
+                            throw new RuntimeException("定向派单需要车数与已选车辆数量不一致");
+                        }
                     }
                     OrderGoods orderGoods = new OrderGoods();
                     //提取吨数

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsTruckBindDaoImpl.java

@@ -5,6 +5,7 @@ import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.mapper.OrderGoodsTruckBindMapper;
 import com.clx.performance.model.OrderGoodsTruckBind;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import com.msl.common.utils.DateUtils;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
@@ -22,7 +23,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
 
     @Override
     public void saveBatchEntity(String orderNo, String orderGoodsNo, List<String> trackList, LocalDateTime now) {
-        baseMapper.saveBatchEntity(orderNo, orderGoodsNo, trackList, now);
+        baseMapper.saveBatchEntity(orderNo, orderGoodsNo, trackList, DateUtils.formatDateTime(now).get());
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsTruckBindMapper.java

@@ -23,7 +23,7 @@ import java.util.List;
 public interface OrderGoodsTruckBindMapper extends BaseMapper<OrderGoodsTruckBind> {
 
     @SelectProvider(type = OrderGoodsTruckBindSqlProvider.class, method = "saveBatchEntity")
-    void saveBatchEntity(String orderNo, String orderGoodsNo, List<String> trackList, LocalDateTime now);
+    void saveBatchEntity(String orderNo, String orderGoodsNo, List<String> trackList, String now);
 
     @Select("select truck_no from order_goods_truck_bind where order_goods_no=#{orderGoodsNo}")
     List<Integer> getTrucksByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo);

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsTruckBindSqlProvider.java

@@ -5,15 +5,15 @@ import java.util.List;
 
 public class OrderGoodsTruckBindSqlProvider {
 
-    public String saveBatchEntity(String orderNo, String orderGoodsNo, List<String> trackList, LocalDateTime now) {
+    public String saveBatchEntity(String orderNo, String orderGoodsNo, List<String> trackList, String now) {
         StringBuffer sqlList = new StringBuffer();
 
-        sqlList.append(" INSERT INTO msg_app_msg_record(order_no,order_goods_no,truck_no,create_time,update_time)  VALUES ");
+        sqlList.append(" INSERT INTO order_goods_truck_bind(order_no,order_goods_no,truck_no,create_time,update_time)  VALUES ");
         for (int i = 0; i < trackList.size(); i++) {
             String truckNo = trackList.get(i);
-            sqlList.append(" (").append(orderNo).append(",").append(orderGoodsNo).append(",").append(truckNo).append(",")
-                    .append(now).append(",").append(now)
-                    .append(")");
+            sqlList.append(" ('").append(orderNo).append("','").append(orderGoodsNo).append("','").append(truckNo).append("','")
+                    .append(now).append("','").append(now)
+                    .append("')");
             if (i < trackList.size() - 1) {
                 sqlList.append(",");
             }

performance-web/src/test/java/com/clx/performance/JobTest.java

 package com.clx.performance;
 
+import com.clx.performance.mapper.OrderGoodsMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.math.BigDecimal;
+
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class JobTest {
 
-//    @Autowired
-//    private QuotationJob quotationJob;
-//
-//    @Test
-//    public void test1() {
-//        quotationJob.quotationExpired();
-//    }
+    @Autowired
+    private OrderGoodsMapper oderGoodsMapper;
+
+    @Test
+    public void test1() {
+        oderGoodsMapper.updateOrderGoodsWeightAndStatus(94,new BigDecimal("23.32"),11);
+    }
 }