Authored by mali

下单bug

@@ -17,6 +17,17 @@ public class AppraiseAddressResp { @@ -17,6 +17,17 @@ public class AppraiseAddressResp {
17 17
18 private Integer areaCode; 18 private Integer areaCode;
19 19
  20 + @JSONField(name="id")
  21 + private Integer type;
  22 +
  23 + public Integer getType() {
  24 + return type;
  25 + }
  26 +
  27 + public void setType(Integer type) {
  28 + this.type = type;
  29 + }
  30 +
20 public Integer getAreaCode() { 31 public Integer getAreaCode() {
21 return areaCode; 32 return areaCode;
22 } 33 }
@@ -66,8 +77,19 @@ public class AppraiseAddressResp { @@ -66,8 +77,19 @@ public class AppraiseAddressResp {
66 private String address; 77 private String address;
67 78
68 private Integer areaCode; 79 private Integer areaCode;
  80 +
  81 + private Integer type;
  82 +
  83 + public Integer getType() {
  84 + return type;
  85 + }
  86 +
  87 + public builder setType(Integer type) {
  88 + this.type = type;
  89 + return this;
  90 + }
69 91
70 - public String getAddressName() { 92 + public String getAddressName() {
71 return addressName; 93 return addressName;
72 } 94 }
73 95
@@ -110,6 +132,7 @@ public class AppraiseAddressResp { @@ -110,6 +132,7 @@ public class AppraiseAddressResp {
110 resp.setAddressName(this.getAddressName()); 132 resp.setAddressName(this.getAddressName());
111 resp.setMobile(this.getMobile()); 133 resp.setMobile(this.getMobile());
112 resp.setAreaCode(this.getAreaCode()); 134 resp.setAreaCode(this.getAreaCode());
  135 + resp.setType(this.getType());
113 136
114 return resp; 137 return resp;
115 } 138 }
@@ -154,6 +154,7 @@ public abstract class AbsOrderListService implements IOrderListService{ @@ -154,6 +154,7 @@ public abstract class AbsOrderListService implements IOrderListService{
154 goodsInfo.setGoodPrice(buyerOrderGoods.getGoodsPrice() == null ? "" :buyerOrderGoods.getGoodsPrice().toPlainString()); 154 goodsInfo.setGoodPrice(buyerOrderGoods.getGoodsPrice() == null ? "" :buyerOrderGoods.getGoodsPrice().toPlainString());
155 goodsInfo.setStorageId(sellerOrderGoods.getStorageId()); 155 goodsInfo.setStorageId(sellerOrderGoods.getStorageId());
156 goodsInfo.setProductId(sellerOrderGoods.getProductId()); 156 goodsInfo.setProductId(sellerOrderGoods.getProductId());
  157 + goodsInfo.setSkup(buyerOrderGoods.getSkup());
157 orderListInfo.setGoodsInfo(goodsInfo); 158 orderListInfo.setGoodsInfo(goodsInfo);
158 159
159 orderListInfo.setCreateTime(DateUtil.formatDate(buyerOrder.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS)); 160 orderListInfo.setCreateTime(DateUtil.formatDate(buyerOrder.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
@@ -62,7 +62,7 @@ public class AppraiseAddressService { @@ -62,7 +62,7 @@ public class AppraiseAddressService {
62 List<AppraiseAddressResp> appraiseAddressResps = queryAddressInfoList(); 62 List<AppraiseAddressResp> appraiseAddressResps = queryAddressInfoList();
63 63
64 if (CollectionUtils.isEmpty(appraiseAddressResps)) { 64 if (CollectionUtils.isEmpty(appraiseAddressResps)) {
65 - return new AppraiseAddressResp.builder().setMobile("15010019250").setAddressName("YOHO!北京鉴定中心").setAddress("北京市朝阳区建国路81号华贸中心1号写字楼3层").build(); 65 + return new AppraiseAddressResp.builder().setMobile("15010019250").setType(0).setAddressName("YOHO!北京鉴定中心").setAddress("北京市朝阳区建国路81号华贸中心1号写字楼3层").build();
66 } 66 }
67 return appraiseAddressResps.get(0); 67 return appraiseAddressResps.get(0);
68 } 68 }
@@ -91,7 +91,7 @@ public class AppraiseAddressService { @@ -91,7 +91,7 @@ public class AppraiseAddressService {
91 } 91 }
92 92
93 appraiseAddresses.stream().forEach(item -> 93 appraiseAddresses.stream().forEach(item ->
94 - appraiseAddressResps.add(new AppraiseAddressResp.builder().setMobile(item.getMobile()) 94 + appraiseAddressResps.add(new AppraiseAddressResp.builder().setMobile(item.getMobile()).setType(item.getType())
95 .setAreaCode(item.getAreaCode()).setAddressName(item.getAddressName()).setAddress(item.getAddress()).build()) 95 .setAreaCode(item.getAreaCode()).setAddressName(item.getAddressName()).setAddress(item.getAddress()).build())
96 ); 96 );
97 97