修改bug

src/main/java/com/esv/freight/app/common/filter/CheckCustomToken.java

 package com.esv.freight.app.common.filter;
 
 import com.esv.freight.app.common.exception.EException;
-import com.esv.freight.app.feign.CarrierInterface;
-import com.esv.freight.app.feign.DriverInterface;
-import com.esv.freight.app.feign.NoticeInterface;
 import com.esv.freight.app.module.account.CustomToken;
-import com.esv.freight.app.module.account.service.AppLoginService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.regex.Pattern;
 

src/main/java/com/esv/freight/app/module/account/controller/DriverAccountController.java

@@ -33,7 +33,7 @@ import java.util.List;
 
 /**
  * @description: 账号Controller
- * @project: Freight
+ * @project: freight-app-service
  * @name: com.esv.freight.module.ownerBackend.account.controller.DriverAccountController
  * @author: 张志臣
  * @email: zhangzhichen@esvtek.com

src/main/java/com/esv/freight/app/module/account/controller/DriverPasswordController.java

@@ -11,6 +11,7 @@ import com.esv.freight.app.feign.NoticeInterface;
 import com.esv.freight.app.module.account.form.LoginForm;
 import com.esv.freight.app.module.account.form.ModifyPasswordForm;
 import com.esv.freight.app.module.account.service.AppLoginService;
+import com.esv.freight.app.module.account.validator.groups.ValidatorResetPwd;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * @description: 密码Controller
- * @project: Freight
+ * @project: freight-app-service
  * @name: com.esv.freight.module.ownerBackend.account.controller.DriverPasswordController
  * @author: 张志臣
  * @email: zhangzhichen@esvtek.com
@@ -50,7 +51,7 @@ public class DriverPasswordController {
      * createTime 2020/04/14 16:00
      **/
     @PostMapping("/reset")
-    public EResponse reset(@RequestBody(required=false) @Validated(ValidatorInsert.class) LoginForm loginForm) {
+    public EResponse reset(@RequestBody(required=false) @Validated(ValidatorResetPwd.class) LoginForm loginForm) {
 
         // 调用查询帐号详情接口
         JSONObject reqJson = new JSONObject();
@@ -60,7 +61,7 @@ public class DriverPasswordController {
         log.info(result.toJSONString());
 
         if(result.getInteger("code") == 1001) {
-            return EResponse.error(1001, "手机号未注册");
+            return EResponse.error(1004, "无效的手机号");
         }
 
         if(result.getInteger("code") != 200) {

src/main/java/com/esv/freight/app/module/account/controller/OwnerAccountController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * @description: 账号Controller
- * @project: Freight
+ * @project: freight-app-service
  * @name: com.esv.freight.module.ownerBackend.account.controller.OwnerAccountController
  * @author: 张志臣
  * @email: zhangzhichen@esvtek.com

src/main/java/com/esv/freight/app/module/account/controller/OwnerPasswordController.java

@@ -10,6 +10,7 @@ import com.esv.freight.app.module.account.form.ModifyPasswordForm;
 import com.esv.freight.app.module.account.service.AppLoginService;
 import com.esv.freight.app.common.response.EResponse;
 import com.esv.freight.app.common.validator.groups.ValidatorInsert;
+import com.esv.freight.app.module.account.validator.groups.ValidatorResetPwd;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * @description: 密码Controller
- * @project: Freight
+ * @project: freight-app-service
  * @name: com.esv.freight.module.ownerBackend.account.controller.OwnerPasswordController
  * @author: 张志臣
  * @email: zhangzhichen@esvtek.com
@@ -49,7 +50,7 @@ public class OwnerPasswordController {
      * createTime 2020/04/13 10:00
      **/
     @PostMapping("/reset")
-    public EResponse reset(@RequestBody(required=false) @Validated(ValidatorInsert.class) LoginForm loginForm) {
+    public EResponse reset(@RequestBody(required=false) @Validated(ValidatorResetPwd.class) LoginForm loginForm) {
 
         // 调用查询帐号详情接口
         JSONObject reqJson = new JSONObject();
@@ -59,7 +60,7 @@ public class OwnerPasswordController {
         log.info(result.toJSONString());
 
         if(result.getInteger("code") == 1002) {
-            return EResponse.error(1002, "手机号未注册");
+            return EResponse.error(1004, "无效的手机号");
         }
 
         if(result.getInteger("code") != 200) {

src/main/java/com/esv/freight/app/module/account/dao/AppLoginDao.java

@@ -5,11 +5,13 @@ import com.esv.freight.app.module.account.entity.AppLoginEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * APP用户登录信息表
- *
- * @author 张志臣
- * @email zhangzhichen@esvtek.com
- * @date 2020-04-13 16:00
+ * @description: APP用户登录信息表
+ * @project: freight-app-service
+ * @name: com.esv.freight.app.module.account.dao.AppLoginDao
+ * @author: 张志臣
+ * @email: zhangzhichen@esvtek.com
+ * @createTime: 2020/04/13 14:00
+ * @version:1.0
  */
 @Mapper
 public interface AppLoginDao extends BaseMapper<AppLoginEntity> {

src/main/java/com/esv/freight/app/module/account/entity/AppLoginEntity.java

@@ -8,11 +8,13 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * APP用户登录信息表
- *
- * @author 张志臣
- * @email zhangzhichen@esvtek.com
- * @date 2020-04-13 16:00
+ * @description: APP用户登录信息表
+ * @project: freight-app-service
+ * @name: com.esv.freight.app.module.account.entity.AppLoginEntity
+ * @author: 张志臣
+ * @email: zhangzhichen@esvtek.com
+ * @createTime: 2020/04/13 14:00
+ * @version:1.0
  */
 @Data
 @TableName("app_login_info")

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

@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @description: 司机实名认证验证类
- * @project: Freight
+ * @project: freight-app-service
  * @name: com.esv.freight.module.ownerBackend.account.form.DriverAuthForm
  * @author: 张志臣
  * @email: zhangzhichen@esvtek.com

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.module.account.validator.groups.ValidatorAccountExist;
-import com.esv.freight.app.module.account.validator.groups.ValidatorDriverLoginBySms;
-import com.esv.freight.app.module.account.validator.groups.ValidatorLoginByPwd;
-import com.esv.freight.app.module.account.validator.groups.ValidatorLoginBySms;
+import com.esv.freight.app.module.account.validator.groups.*;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -12,7 +9,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @description:
- * @project: Freight
+ * @project: freight-app-service
  * @name: com.esv.freight.module.ownerBackend.account.form.LoginForm
  * @author: 张志臣
  * @email: zhangzhichen@esvtek.com
@@ -25,22 +22,22 @@ public class LoginForm {
     /**
      * 手机号
      */
-    @Length(min = 11, max = 11, message = "参数phone长度不合法", groups = {ValidatorLoginByPwd.class, ValidatorLoginBySms.class, ValidatorAccountExist.class, ValidatorDriverLoginBySms.class})
-    @NotBlank(message = "参数phone不能为空", groups = {ValidatorLoginByPwd.class, ValidatorLoginBySms.class, ValidatorAccountExist.class, ValidatorDriverLoginBySms.class})
+    @Length(min = 11, max = 11, message = "参数phone长度不合法", groups = {ValidatorResetPwd.class, ValidatorLoginByPwd.class, ValidatorLoginBySms.class, ValidatorAccountExist.class, ValidatorDriverLoginBySms.class})
+    @NotBlank(message = "参数phone不能为空", groups = {ValidatorResetPwd.class, ValidatorLoginByPwd.class, ValidatorLoginBySms.class, ValidatorAccountExist.class, ValidatorDriverLoginBySms.class})
     private String phone;
 
     /**
      * 短信验证码
      */
-    @Length(min = 6, max = 6, message = "参数smsCode长度不合法", groups = {ValidatorLoginBySms.class, ValidatorDriverLoginBySms.class})
-    @NotBlank(message = "参数smsCode不能为空", groups = {ValidatorLoginBySms.class})
+    @Length(min = 6, max = 6, message = "参数smsCode长度不合法", groups = {ValidatorResetPwd.class, ValidatorLoginBySms.class, ValidatorDriverLoginBySms.class})
+    @NotBlank(message = "参数smsCode不能为空", groups = {ValidatorResetPwd.class, ValidatorLoginBySms.class})
     private String smsCode;
 
     /**
      * 密码
      */
-    @Length(min = 32, max = 32, message = "参数pwd长度不合法", groups = {ValidatorLoginByPwd.class})
-    @NotBlank(message = "参数pwd不能为空", groups = {ValidatorLoginByPwd.class})
+    @Length(min = 32, max = 32, message = "参数pwd长度不合法", groups = {ValidatorResetPwd.class, ValidatorLoginByPwd.class})
+    @NotBlank(message = "参数pwd不能为空", groups = {ValidatorResetPwd.class, ValidatorLoginByPwd.class})
     private String pwd;
 
     /**

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

@@ -11,7 +11,7 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
 /**
  * @description: 重置密码验证类
- * @project: Freight
+ * @project: freight-app-service
  * @name: com.esv.freight.module.ownerBackend.account.form.ModifyPasswordFrom
  * @author: 张志臣
  * @email: zhangzhichen@esvtek.com

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

 package com.esv.freight.app.module.account.form;
 
-import com.esv.freight.app.common.validator.groups.ValidatorInsert;
-import com.esv.freight.app.common.validator.groups.ValidatorList;
 import com.esv.freight.app.common.validator.groups.ValidatorUpdate;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -14,7 +12,7 @@ import javax.validation.constraints.Pattern;
 
 /**
  * @description: 货主实名认证验证类
- * @project: Freight
+ * @project: freight-app-service
  * @name: com.esv.freight.module.ownerBackend.account.form.OwnerAuthForm
  * @author: 张志臣
  * @email: zhangzhichen@esvtek.com

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

@@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @description: 刷新token验证类
- * @project: Freight
+ * @project: freight-app-service
  * @name: com.esv.freight.module.ownerBackend.account.form.RefreshTokenForm
  * @author: 张志臣
  * @email: zhangzhichen@esvtek.com

src/main/java/com/esv/freight/app/module/account/service/AppLoginService.java

@@ -67,4 +67,12 @@ public interface AppLoginService extends IService<AppLoginEntity> {
      * createTime 2020/04/13 16:48
      **/
     boolean isInvalidRefreshToken(String refreshToken);
+    /**
+     * description 获取AppLoginEntity
+     * param [phone]
+     * return java.lang.Long
+     * author 张志臣
+     * createTime 2020/04/13 16:48
+     **/
+    AppLoginEntity getAccountByPhone(String phone);
 }
\ No newline at end of file

src/main/java/com/esv/freight/app/module/account/service/impl/AppLoginImpl.java

@@ -135,7 +135,7 @@ public class AppLoginImpl extends ServiceImpl<AppLoginDao, AppLoginEntity> imple
         }
 
         if(StringUtils.isEmpty(entity.getAccessToken())) {
-            throw new EException(601, "您的车辆信息发生变化，需要您重新登录");
+            throw new EException(601, "您的账号信息发生变化，需要您重新登录");
         }
 
         if(!entity.getAccessToken().equals(accessToken)) {
@@ -167,7 +167,8 @@ public class AppLoginImpl extends ServiceImpl<AppLoginDao, AppLoginEntity> imple
         return false;
     }
 
-    private AppLoginEntity getAccountByPhone(String phone) {
+    @Override
+    public AppLoginEntity getAccountByPhone(String phone) {
         QueryWrapper<AppLoginEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", phone);
         return this.baseMapper.selectOne(queryWrapper);

src/main/java/com/esv/freight/app/module/account/validator/groups/ValidatorResetPwd.java

+package com.esv.freight.app.module.account.validator.groups;
+
+public interface ValidatorResetPwd {
+}

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

@@ -109,7 +109,7 @@ public class OrderController {
         JSONObject data = result.getJSONObject("data");
         pageResultVO.setPageSize(data.getLong("pageSize"));
         pageResultVO.setPageNum(data.getLong("pageNum"));
-        pageResultVO.setTotal(data.getLong("total"));
+        pageResultVO.setTotal(data.getLong("totalSize"));
         pageResultVO.setRecordSize(data.getLong("recordSize"));
         if(pageResultVO.getRecordSize() > 0) {
             JSONArray items = data.getJSONArray("records");
@@ -118,7 +118,7 @@ public class OrderController {
                 OrderListItemVO vo = new OrderListItemVO();
                 JSONObject object = items.getJSONObject(i);
                 vo.setId(object.getLong("id"));
-                vo.setOrderNO(object.getString("orderNo"));
+                vo.setOrderNo(object.getString("orderNo"));
                 vo.setOrderState(object.getInteger("orderState"));
                 vo.setAuditState(object.getInteger("auditState"));
                 vo.setDeliveryCityCode(object.getString("deliveryCityCode"));
@@ -126,13 +126,18 @@ public class OrderController {
                 vo.setBusinessType(object.getInteger("businessType"));
                 vo.setGoodsType(object.getInteger("goodsType"));
                 vo.setGoodsName(object.getInteger("goodsName"));
+                vo.setGoodsNameCode(object.getInteger("goodsNameCode"));
                 vo.setGoodsDetail(object.getString("goodsDetail"));
-                vo.setGoodsTotalAmount(object.getBigDecimal("goodsTotalAmount"));
-                vo.setGoodsUnit(object.getString("goodsUnit"));
-                vo.setRequiredDeliveryTime(object.getDate("requiredDeliveryTime"));
-                vo.setRequiredReceiveTime(object.getDate("requiredReceiveTime"));
-                vo.setCreateTime(object.getDate("createTime"));
+                vo.setTotalGoodsAmount(object.getBigDecimal("totalGoodsAmount"));
+                vo.setRemainingGoodsAmount(object.getBigDecimal("remainingGoodsAmount"));
+                vo.setGoodsUnit(Integer.parseInt(object.getString("goodsUnit")));
+                vo.setGoodsUnitPrice(object.getBigDecimal("goodsUnitPrice"));
+                vo.setFreightUnitPriceInput(object.getBigDecimal("freightUnitPriceInput"));
+                vo.setRequiredDeliveryTime(object.getLong("requiredDeliveryTime"));
+                vo.setRequiredReceiveTime(object.getLong("requiredReceiveTime"));
+                vo.setCreateTime(object.getLong("createTime"));
                 vo.setOrderSource(object.getString("orderSource"));
+                vo.setPlaceOrderTime(object.getLong("placeOrderTime"));
                 records.add(vo);
             }
 
@@ -198,7 +203,7 @@ public class OrderController {
 
         // 调用取消订单接口
         JSONObject reqJson = new JSONObject();
-        reqJson.put("id", orderQueryForm.getId());
+        reqJson.put("orderId", orderQueryForm.getId());
         log.info(reqJson.toJSONString());
         JSONObject result = tmsInterface.cancelOrder(reqJson);
         log.info(result.toJSONString());
@@ -224,7 +229,7 @@ public class OrderController {
 
         // 调用获取订单详情接口
         JSONObject reqJson = new JSONObject();
-        reqJson.put("id", orderQueryForm.getId());
+        reqJson.put("orderId", orderQueryForm.getId());
         log.info(reqJson.toJSONString());
         JSONObject result = tmsInterface.getOrderDetail(reqJson);
         log.info(result.toJSONString());
@@ -242,20 +247,37 @@ public class OrderController {
         orderDetailVO.setBusinessType(data.getInteger("businessType"));
         orderDetailVO.setGoodsType(data.getInteger("goodsType"));
         orderDetailVO.setGoodsNameCode(data.getInteger("goodsNameCode"));
-        orderDetailVO.setGoodsNameCode(data.getInteger("goodsNameCode"));
+        orderDetailVO.setGoodsName(data.getString("goodsName"));
         orderDetailVO.setGoodsDetail(data.getString("goodsDetail"));
         orderDetailVO.setGoodsTotalAmount(data.getBigDecimal("totalGoodsAmount"));
+        orderDetailVO.setRemainingGoodsAmount(data.getBigDecimal("remainingGoodsAmount"));
         orderDetailVO.setGoodsUnit(data.getInteger("goodsUnit"));
         orderDetailVO.setGoodsUnitPrice(data.getBigDecimal("goodsUnitPrice"));
         orderDetailVO.setFreightUnitPriceInput(data.getBigDecimal("freightUnitPriceInput"));
         orderDetailVO.setDeliveryAddressId(data.getLong("deliveryAddressId"));
+        orderDetailVO.setDeliveryAddressName(data.getString("deliveryAddressName"));
+        orderDetailVO.setDeliveryProvinceCode(data.getString("deliveryProvinceCode"));
+        orderDetailVO.setDeliveryCityCode(data.getString("deliveryCityCode"));
+        orderDetailVO.setDeliveryDistrictCode(data.getString("deliveryDistrictCode"));
+        orderDetailVO.setDeliveryDetailAddress(data.getString("deliveryDetailAddress"));
+        orderDetailVO.setDeliverer(data.getString("deliverer"));
+        orderDetailVO.setDelivererPhone(data.getString("delivererPhone"));
         orderDetailVO.setReceiveAddressId(data.getLong("receiveAddressId"));
+        orderDetailVO.setReceiveAddressName(data.getString("receiveAddressName"));
+        orderDetailVO.setReceiveProvinceCode(data.getString("receiveProvinceCode"));
+        orderDetailVO.setReceiveCityCode(data.getString("receiveCityCode"));
+        orderDetailVO.setReceiveDistrictCode(data.getString("receiveDistrictCode"));
+        orderDetailVO.setReceiveDetailAddress(data.getString("receiveDetailAddress"));
+        orderDetailVO.setReceiver(data.getString("receiver"));
+        orderDetailVO.setReceiverPhone(data.getString("receiverPhone"));
         orderDetailVO.setRequiredDeliveryTime(data.getLong("requiredDeliveryTime"));
         orderDetailVO.setRequiredReceiveTime(data.getLong("requiredReceiveTime"));
         orderDetailVO.setVehicleTypeMain(data.getInteger("vehicleTypeMain"));
         orderDetailVO.setVehicleTypeSub(data.getInteger("vehicleTypeSub"));
         orderDetailVO.setVehicleLength(data.getBigDecimal("vehicleLength"));
         orderDetailVO.setRemark(data.getString("remark"));
+        orderDetailVO.setPlaceOrderTime(data.getLong("placeOrderTime"));
+        orderDetailVO.setRequiredReceiptTime(data.getLong("requiredReceiptTime"));
         return EResponse.ok(orderDetailVO);
     }
 

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

@@ -68,7 +68,7 @@ public class OrderForm {
     /**
      * 货物明细
      */
-    @Length(max = 300, message = "参数货物明细长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class,})
+    @Length(max = 100, message = "参数货物明细长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class,})
     private String goodsDetail;
 
     /**

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

@@ -33,7 +33,7 @@ public class OrderQueryForm {
     /**
      * 货主id
      */
-    @Positive(message = "参数货主ID不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})
+    @Positive(message = "参数货主ID不合法", groups = {ValidatorList.class, ValidatorInsert.class, ValidatorUpdate.class})
     private Long goodsOwnerId;
 
     /**

src/main/java/com/esv/freight/app/module/order/vo/OrderDetailVO.java

 package com.esv.freight.app.module.order.vo;
 
 import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @description: 订单详情VO
@@ -50,6 +54,11 @@ public class OrderDetailVO {
      */
     private Integer goodsNameCode;
 
+    /**
+     * 货物名称
+     */
+    private String goodsName;
+
     /**
      * 货物明细
      */
@@ -59,6 +68,12 @@ public class OrderDetailVO {
      * 货物订单量
      */
     private BigDecimal goodsTotalAmount;
+
+    /**
+     * 货物剩余订单量
+     */
+    private BigDecimal remainingGoodsAmount;
+
     /**
      * 货物单位
      */
@@ -79,32 +94,123 @@ public class OrderDetailVO {
      */
     private Long deliveryAddressId;
 
+    /**
+     * 发货地址名称
+     */
+    private String deliveryAddressName;
+
+    /**
+     * 发货地址省份
+     */
+    private String deliveryProvinceCode;
+
+    /**
+     * 发货地址城市
+     */
+    private String deliveryCityCode;
+
+    /**
+     * 发货地址区、县
+     */
+    private String deliveryDistrictCode;
+
+    /**
+     * 发货详细地址
+     */
+    private String deliveryDetailAddress;
+
+    /**
+     * 发货人
+     */
+    private String deliverer;
+
+    /**
+     * 发货人手机号
+     */
+    private String delivererPhone;
+
     /**
      * 收货地址ID
      */
     private Long receiveAddressId;
+
+    /**
+     * 收货地址名称
+     */
+    private String receiveAddressName;
+
+    /**
+     * 收货地址省份
+     */
+    private String receiveProvinceCode;
+
+    /**
+     * 收货地址城市
+     */
+    private String receiveCityCode;
+
+    /**
+     * 收货地址区、县
+     */
+    private String receiveDistrictCode;
+
+    /**
+     * 收货详细地址
+     */
+    private String receiveDetailAddress;
+
+    /**
+     * 收货人
+     */
+    private String receiver;
+
+    /**
+     * 收货人电话
+     */
+    private String receiverPhone;
+
     /**
      * 要求发货时间
      */
     private Long requiredDeliveryTime;
+
     /**
      * 要求交货时间
      */
     private Long requiredReceiveTime;
+
     /**
      * 车辆类型，主类型
      */
     private Integer vehicleTypeMain;
+
     /**
      * 车辆类型，子类型
      */
     private Integer vehicleTypeSub;
+
     /**
      * 车长
      */
     private BigDecimal vehicleLength;
+
     /**
      * 备注
      */
     private String remark;
+
+    /**
+     * 客户下单时间
+     */
+    private Long placeOrderTime;
+
+    /**
+     * 要求回单时间
+     */
+    private Long requiredReceiptTime;
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
+    }
 }

src/main/java/com/esv/freight/app/module/order/vo/OrderListItemVO.java

@@ -25,7 +25,7 @@ public class OrderListItemVO {
     /**
      * 	订单号
      */
-    private String orderNO;
+    private String orderNo;
 
     /**
      * 订单状态.
@@ -62,6 +62,11 @@ public class OrderListItemVO {
      */
     private Integer goodsName;
 
+    /**
+     * 货物名称编码
+     */
+    private Integer goodsNameCode;
+
     /**
      * 货物明细
      */
@@ -70,30 +75,50 @@ public class OrderListItemVO {
     /**
      * 货物订单量
      */
-    private BigDecimal goodsTotalAmount;
+    private BigDecimal totalGoodsAmount;
+
+    /**
+     * 货物剩余订单量
+     */
+    private BigDecimal remainingGoodsAmount;
 
     /**
      * 货物单位
      */
-    private String goodsUnit;
+    private Integer goodsUnit;
+
+    /**
+     * 货物单价
+     */
+    private BigDecimal goodsUnitPrice;
+
+    /**
+     * 运费单价（收入）
+     */
+    private BigDecimal freightUnitPriceInput;
 
     /**
      * 要求发货时间
      */
-    private Date requiredDeliveryTime;
+    private Long requiredDeliveryTime;
 
     /**
      * 要求交货时间
      */
-    private Date requiredReceiveTime;
+    private Long requiredReceiveTime;
 
     /**
      * 订单创建时间
      */
-    private Date createTime;
+    private Long createTime;
 
     /**
      * 订单来源
      */
     private String orderSource;
+
+    /**
+     * 客户下单时间
+     */
+    private Long placeOrderTime;
 }