Skip to content

sibu-v-mall / sibu-v-mall-third-api

转到一个项目
切换导航栏
切换导航栏固定状态
b4e3396d 由 lauka
选项

菠萝派接口-检测退款，修改返回信息

1 个父辈 bec237c6
内嵌 并排
正在显示 2 个修改的文件 包含 4 行增加 和 7 行删除
...@@ -346,7 +346,7 @@ ...@@ -346,7 +346,7 @@
346 346
347 <!--根据订单号查询换货信息--> 347 <!--根据订单号查询换货信息-->
348 <select id="getMemberProductBackByOrderSn" parameterType="java.lang.String" resultMap="memberProductBackResult"> 348 <select id="getMemberProductBackByOrderSn" parameterType="java.lang.String" resultMap="memberProductBackResult">
349 SELECT * FROM member_product_back WHERE order_sn = #{orderSn} AND state_return IN ('1','2','3','4') ORDER BY create_time 349 SELECT * FROM member_product_back WHERE order_sn = #{orderSn} AND state_return IN ('1','2','3','4') AND state_money = 1 ORDER BY create_time DESC
350 </select> 350 </select>
351 351
352 <!--换货实体类--> 352 <!--换货实体类-->
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
399 399
400 <!--根据订单号查询换货信息--> 400 <!--根据订单号查询换货信息-->
401 <select id="getMemberProductExchangeByOrderSn" parameterType="java.lang.String" resultMap="memberProductExchangeResult"> 401 <select id="getMemberProductExchangeByOrderSn" parameterType="java.lang.String" resultMap="memberProductExchangeResult">
402 SELECT * FROM member_product_exchange WHERE order_sn = #{orderSn} AND state IN ('1','2','3','4') ORDER BY create_time 402 SELECT * FROM member_product_exchange WHERE order_sn = #{orderSn} AND state IN ('1','2','3','4') ORDER BY create_time DESC
403 </select> 403 </select>
404 404
405 <!-- 投诉表实体--> 405 <!-- 投诉表实体-->
......
...@@ -55,7 +55,7 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef ...@@ -55,7 +55,7 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef
55 MemberProductBack memberProductBack = memberProductBackList.stream().findFirst().get(); 55 MemberProductBack memberProductBack = memberProductBackList.stream().findFirst().get();
56 PineappleRefundEnum refundEnum = PineappleRefundEnum.resolveByPlatformRefundStatus(memberProductBack.getStateReturn()); 56 PineappleRefundEnum refundEnum = PineappleRefundEnum.resolveByPlatformRefundStatus(memberProductBack.getStateReturn());
57 //如果退款状态是店铺收货需要判断该退款信息是否已付款 57 //如果退款状态是店铺收货需要判断该退款信息是否已付款
58 if(memberProductBack.getStateReturn().intValue() == MemberProductBackEnum.ShopDelivery.getCode()){ 58 /*if(memberProductBack.getStateReturn().intValue() == MemberProductBackEnum.ShopDelivery.getCode()){
59 if(memberProductBack.getStateMoney() == 1){ 59 if(memberProductBack.getStateMoney() == 1){
60 checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_99.getCode()); 60 checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_99.getCode());
61 checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_99.getMsg()); 61 checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_99.getMsg());
...@@ -73,7 +73,7 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef ...@@ -73,7 +73,7 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef
73 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg()); 73 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
74 return checkRefundStatusResponse; 74 return checkRefundStatusResponse;
75 } 75 }
76 } 76 }*/
77 checkRefundStatusResponse.setRefundStatus(refundEnum.getCode()); 77 checkRefundStatusResponse.setRefundStatus(refundEnum.getCode());
78 checkRefundStatusResponse.setSubmessage(refundEnum.getMsg()); 78 checkRefundStatusResponse.setSubmessage(refundEnum.getMsg());
79 checkRefundStatusResponse.setRefundStatusdescription(refundEnum.getMsg()); 79 checkRefundStatusResponse.setRefundStatusdescription(refundEnum.getMsg());
...@@ -87,7 +87,6 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef ...@@ -87,7 +87,6 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef
87 List<MemberProductExchange> memberProductExchangeList = memberReadDao.getMemberProductExchangeByOrderSn(callRequest.getBizModel().getOrderID()); 87 List<MemberProductExchange> memberProductExchangeList = memberReadDao.getMemberProductExchangeByOrderSn(callRequest.getBizModel().getOrderID());
88 if(!StringUtil.isNull(memberProductExchangeList) && !memberProductExchangeList.isEmpty()){ 88 if(!StringUtil.isNull(memberProductExchangeList) && !memberProductExchangeList.isEmpty()){
89 MemberProductExchange memberProductExchange = memberProductExchangeList.stream().findFirst().get(); 89 MemberProductExchange memberProductExchange = memberProductExchangeList.stream().findFirst().get();
90 if(!StringUtil.isNull(memberProductExchange)){
91 PineappleExchangeEnum exchangeEnum = PineappleExchangeEnum.resolveByPlatformRefundStatus(memberProductExchange.getState()); 90 PineappleExchangeEnum exchangeEnum = PineappleExchangeEnum.resolveByPlatformRefundStatus(memberProductExchange.getState());
92 checkRefundStatusResponse.setRefundStatus(exchangeEnum.getCode()); 91 checkRefundStatusResponse.setRefundStatus(exchangeEnum.getCode());
93 checkRefundStatusResponse.setSubmessage(exchangeEnum.getMsg()); 92 checkRefundStatusResponse.setSubmessage(exchangeEnum.getMsg());
...@@ -97,8 +96,6 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef ...@@ -97,8 +96,6 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef
97 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg()); 96 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
98 return checkRefundStatusResponse; 97 return checkRefundStatusResponse;
99 } 98 }
100
101 }
102 //3.如果都没有记录需要查询seller_complaint(投诉表)，根据order_id订单id查询 99 //3.如果都没有记录需要查询seller_complaint(投诉表)，根据order_id订单id查询
103 List<SellerComplaint> sellerComplaintList = memberReadDao.getSellerComplaintById(orders.getId()); 100 List<SellerComplaint> sellerComplaintList = memberReadDao.getSellerComplaintById(orders.getId());
104 if(!StringUtil.isNull(sellerComplaintList) && !sellerComplaintList.isEmpty()){ 101 if(!StringUtil.isNull(sellerComplaintList) && !sellerComplaintList.isEmpty()){
......