Skip to content

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

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

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

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