修改货主发布订单参数

src/main/java/com/esv/freight/app/module/account/form/LoginForm.java

 package com.esv.freight.app.module.account.form;
 
-import com.esv.freight.app.common.validator.groups.ValidatorUpdate;
 import com.esv.freight.app.module.account.validator.groups.*;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -52,7 +51,7 @@ public class LoginForm {
     /**
      * 推送设备ID
      */
-    @NotBlank(message = "参数pushId不能为空", groups = {ValidatorResetPwd.class, ValidatorLoginByPwd.class, ValidatorLoginBySms.class, ValidatorDriverLoginBySms.class})
+    @NotBlank(message = "参数pushId不能为空", groups = {ValidatorLoginByPwd.class, ValidatorLoginBySms.class, ValidatorDriverLoginBySms.class})
     private String pushId;
 
     @Override

src/main/java/com/esv/freight/app/module/grabbing/controller/GrabController.java

@@ -87,6 +87,26 @@ public class GrabController {
             reqJson.put("vehicleTypeSub", orderGrabbingQueryForm.getVehicleTypeSub());
         }
 
+        if(orderGrabbingQueryForm.getVehicleTypeList() != null) {
+            reqJson.put("vehicleTypeList", orderGrabbingQueryForm.getVehicleTypeList());
+        }
+
+        if(orderGrabbingQueryForm.getGoodsTypeList() != null) {
+            reqJson.put("goodsTypeList", orderGrabbingQueryForm.getGoodsTypeList());
+        }
+
+        if(orderGrabbingQueryForm.getVehicleLength() != null) {
+            reqJson.put("vehicleLength", orderGrabbingQueryForm.getVehicleLength());
+        }
+
+        if(orderGrabbingQueryForm.getDeliveryStartTime() != null) {
+            reqJson.put("deliveryStartTime", orderGrabbingQueryForm.getDeliveryStartTime());
+        }
+
+        if(orderGrabbingQueryForm.getDeliveryEndTime() != null) {
+            reqJson.put("deliveryEndTime", orderGrabbingQueryForm.getDeliveryEndTime());
+        }
+
         reqJson.put("pageNum", orderGrabbingQueryForm.getPageNum());
         reqJson.put("pageSize", orderGrabbingQueryForm.getPageSize());
         log.info(reqJson.toJSONString());

src/main/java/com/esv/freight/app/module/grabbing/form/OrderGrabbingQueryForm.java

@@ -11,6 +11,9 @@ import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Positive;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @description:
@@ -34,34 +37,66 @@ public class OrderGrabbingQueryForm {
      */
     @NotNull(message = "参数抢单信息ID不能为空", groups = {ValidatorDetail.class})
     private Long orderGrabbingId;
+
     /**
      * 订单ID
      */
     @NotNull(message = "参数订单ID不能为空", groups = {ValidatorUpdate.class})
     private Long orderNo;
+
     /**
      * 车辆类型，主类型
      */
     private Integer vehicleTypeMain;
+
     /**
      * 车辆类型，子类型
      */
     private Integer vehicleTypeSub;
+
+    /**
+     * 车型列表
+     */
+    private List<Integer> vehicleTypeList;
+
+    /**
+     * 货物类型列表
+     */
+    private List<Integer> goodsTypeList;
+
+    /**
+     * 车长
+     */
+    private BigDecimal vehicleLength;
+
+    /**
+     * 发货开始时间
+     */
+    private Date deliveryStartTime;
+
+    /**
+     * 发货结束时间
+     */
+    private Date deliveryEndTime;
+
     /**
      * 发货地址 省份
      */
     @Length(max = 6, message = "参数发货地址 省份长度不合法", groups = {ValidatorList.class})
     private String deliveryProvinceCode;
+
     /**
      * 发货地址 城市
      */
     @Length(max = 6, message = "参数发货地址 城市长度不合法", groups = {ValidatorList.class})
     private String deliveryCityCode;
+
     /**
      * 交货地址 省份
      */
     @Length(max = 6, message = "参数交货地址 省份长度不合法", groups = {ValidatorList.class})
     private String receiveProvinceCode;
+
     /**
      * 交货地址 城市
      */

src/main/java/com/esv/freight/app/module/order/controller/OrderController.java

@@ -171,7 +171,7 @@ public class OrderController {
         reqJson.put("vehicleLength", orderForm.getVehicleLength());
         reqJson.put("orderSource", 2);
         reqJson.put("remark", orderForm.getRemark());
-        reqJson.put("signData", orderForm.getSignData());
+        reqJson.put("signId", orderForm.getSignId());
         reqJson.put("bargainAllowed", orderForm.getBargainAllowed());
         log.info(reqJson.toJSONString());
         JSONObject result = tmsInterface.addOrderOwner(reqJson);

src/main/java/com/esv/freight/app/module/order/form/OrderForm.java

@@ -35,8 +35,8 @@ public class OrderForm {
     /**
      * 货主签名数据
      */
-    @NotBlank(message = "参数signData不能为空", groups = {ValidatorInsert.class})
-    private String signData;
+    @NotBlank(message = "参数signId不能为空", groups = {ValidatorInsert.class})
+    private String signId;
 
     /**
      * 货主id