70b11a17 刘嘉

菠萝派接口修改

1 个父辈 872263c8
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
364 express_code = concat(IFNULL(concat(express_code,','),''),#{expressCode}), 364 express_code = concat(IFNULL(concat(express_code,','),''),#{expressCode}),
365 </if> 365 </if>
366 <if test="buyerPhone !=null and buyerPhone !=''"> 366 <if test="buyerPhone !=null and buyerPhone !=''">
367 buyer_phone = #{buyerPhone} 367 buyer_phone = #{buyerPhone},
368 </if> 368 </if>
369 <if test="address!=null and address!='' "> 369 <if test="address!=null and address!='' ">
370 address =#{address}, 370 address =#{address},
......
...@@ -14,8 +14,8 @@ import java.util.List; ...@@ -14,8 +14,8 @@ import java.util.List;
14 */ 14 */
15 public enum DownloadProductStatusEnum { 15 public enum DownloadProductStatusEnum {
16 16
17 PUTAWAY("JH_01", "已上架商品",PineappleEnum.MALL_PRODUCT_PUTAWAY__STATUS),SOLDIOUT("JH_02","已下架商品",PineappleEnum.MALL_PRODUCT_SOLDIOUT__STATUS), 17 JH_01("JH_01", "已上架商品",PineappleEnum.MALL_PRODUCT_PUTAWAY__STATUS),JH_02("JH_02","已下架商品",PineappleEnum.MALL_PRODUCT_SOLDIOUT__STATUS),
18 ALL("JH_99", "所有商品"); 18 JH_99("JH_99", "所有商品",-1);
19 19
20 private String code ; // 错误代码 20 private String code ; // 错误代码
21 private String msg; // 错误消息 21 private String msg; // 错误消息
...@@ -27,8 +27,8 @@ public enum DownloadProductStatusEnum { ...@@ -27,8 +27,8 @@ public enum DownloadProductStatusEnum {
27 DownloadProductStatusEnum result = enums.stream() 27 DownloadProductStatusEnum result = enums.stream()
28 .filter(p -> StringUtils.equalsIgnoreCase(p.getCode(), code)) 28 .filter(p -> StringUtils.equalsIgnoreCase(p.getCode(), code))
29 .findFirst() 29 .findFirst()
30 .orElse(DownloadProductStatusEnum.ALL); 30 .orElse(DownloadProductStatusEnum.JH_99);
31 return result.status ==null?-1:result.status; 31 return result.status;
32 } 32 }
33 33
34 34
......
...@@ -70,10 +70,10 @@ public class DownloadProductBizServiceImpl extends AbstractBizService<DownloadP ...@@ -70,10 +70,10 @@ public class DownloadProductBizServiceImpl extends AbstractBizService<DownloadP
70 product.setSkus(downloadProductSkuBeanList); 70 product.setSkus(downloadProductSkuBeanList);
71 }; 71 };
72 downloadProductResponse.setTotalcount(downloadProductBeanList.size()); 72 downloadProductResponse.setTotalcount(downloadProductBeanList.size());
73 downloadProductResponse.setGoodslist(downloadProductBeanList);
74 }else{ 73 }else{
75 downloadProductResponse.setTotalcount(0); 74 downloadProductResponse.setTotalcount(0);
76 } 75 }
76 downloadProductResponse.setGoodslist(downloadProductBeanList);
77 downloadProductResponse.setCode(PineappleEnum.SUCCESS.getCode()); 77 downloadProductResponse.setCode(PineappleEnum.SUCCESS.getCode());
78 downloadProductResponse.setMessage(PineappleEnum.SUCCESS.getMsg()); 78 downloadProductResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
79 return downloadProductResponse; 79 return downloadProductResponse;
......
...@@ -76,7 +76,7 @@ public class GetRefundBizServiceImpl extends AbstractBizService<GetRefundReques ...@@ -76,7 +76,7 @@ public class GetRefundBizServiceImpl extends AbstractBizService<GetRefundReques
76 76
77 77
78 } 78 }
79 getRefundResponse.setRefunds(refundBeanList); 79 getRefundResponse.setTotalcount(refundBeanList.size());
80 }else{ 80 }else{
81 getRefundResponse.setTotalcount(0); 81 getRefundResponse.setTotalcount(0);
82 } 82 }
......