更新二级市场订单

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/AppTbGoodsDemandController.java

@@ -115,8 +115,8 @@ public class AppTbGoodsDemandController {
     @RequestMapping("goodsDemandDetail")
     public AjaxJson goodsDemandDetail() {
         SoMap so = SoMap.getRequestSoMap();
-        GoodsDemandVo goodsDemandVos = tbGoodsDemandService.goodsDemandList(so.startPage());
-        return AjaxJson.getPageData(so.getDataCount(), goodsDemandVos);
+        GoodsDemandVo goodsDemandVos = tbGoodsDemandService.goodsDemandList(so);
+        return AjaxJson.getSuccessData(goodsDemandVos);
     }
 
     /**

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/MethodGoodsDemandService.java

@@ -77,12 +77,14 @@ public class MethodGoodsDemandService {
             goodsDemandVo.setLevelOneGoodsId(item.getLevelOneGoodsId());
             goodsDemandVo.setAddressName(item.getAddressName());
             goodsDemandVo.setPhone(item.getPhone());
+            goodsDemandVo.setGoodsNo(item.getGoodsNo());
+            goodsDemandVo.setGoodsUnit(item.getGoodsUnit());
             goodsDemandVo.setName(item.getName());
             goodsDemandVo.setIsConfirm(item.getIsConfirm());
             goodsDemandVo.setTradeAreaId(item.getTradeAreaId());
             goodsDemandVo.setTradeAreaName(item.getTradeAreaName());
             goodsDemandVo.setIsRelease(item.getIsRelease());
-
+            goodsDemandVo.setArrivalTime(item.getArrivalTime());
             // 获取已确认的报价信息
             if(tbDemandQuotations.size() > 0) {
                 TbDemandQuotation tbDemandQuotation = tbDemandQuotations.get(0);

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/vo/GoodsDemandVo.java

@@ -1,7 +1,9 @@
 package com.pj.tb_goods_demand.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -34,6 +36,17 @@ public class GoodsDemandVo {
      * 商品图片
      */
     private String goodsImg;
+
+    /**
+     * 计价单位
+     */
+    private String goodsUnit;
+
+    /**
+     * 商品编号
+     */
+    private String goodsNo;
+
     /**
      * 组Id
      */
@@ -79,6 +92,13 @@ public class GoodsDemandVo {
     private Date goodsDemandTime;
 
     /**
+     * 到货时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date arrivalTime;
+
+    /**
      * 一级市场海关允许售卖商品ID
      */
     private Long levelOneGoodsId;

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser_address/TbPurchaserAddressMapper.xml

@@ -23,7 +23,7 @@
 		<include refid="select_sql"></include>
 		<where>
 			<if test=' this.has("id") '> and id = #{id} </if>
-			<if test=' this.has("owner") '> and owner = #{owner} </if>
+			<if test=' this.has("userId") '> and user_id = #{userId} </if>
 		</where>
 		order by
 		<choose>