cd8dab59 刘嘉

修改检测退款逻辑

1 个父辈 c40e01b1
...@@ -54,36 +54,34 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef ...@@ -54,36 +54,34 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef
54 if(!StringUtil.isNull(memberProductBackList) && !memberProductBackList.isEmpty()){ 54 if(!StringUtil.isNull(memberProductBackList) && !memberProductBackList.isEmpty()){
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(!StringUtil.isNull(refundEnum) && PineappleRefundEnum.JH_05.getCode() != refundEnum.getCode()){ 58 if(memberProductBack.getStateReturn().intValue() == MemberProductBackEnum.ShopDelivery.getCode()){
59 //如果退款状态是店铺收货需要判断该退款信息是否已付款 59 if(memberProductBack.getStateMoney() == 1){
60 if(memberProductBack.getStateReturn().intValue() == MemberProductBackEnum.ShopDelivery.getCode()){ 60 checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_99.getCode());
61 if(memberProductBack.getStateMoney() == 1){ 61 checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_99.getMsg());
62 checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_99.getCode()); 62 checkRefundStatusResponse.setRefundStatusdescription(PineappleRefundEnum.JH_99.getMsg());
63 checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_99.getMsg()); 63 checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
64 checkRefundStatusResponse.setRefundStatusdescription(PineappleRefundEnum.JH_99.getMsg()); 64 checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
65 checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList()); 65 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
66 checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode()); 66 return checkRefundStatusResponse;
67 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg()); 67 }else{
68 return checkRefundStatusResponse; 68 checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_06.getCode());
69 }else{ 69 checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_06.getMsg());
70 checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_06.getCode()); 70 checkRefundStatusResponse.setRefundStatusdescription(PineappleRefundEnum.JH_06.getMsg());
71 checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_06.getMsg()); 71 checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
72 checkRefundStatusResponse.setRefundStatusdescription(PineappleRefundEnum.JH_06.getMsg()); 72 checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
73 checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList()); 73 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
74 checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode()); 74 return checkRefundStatusResponse;
75 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
76 return checkRefundStatusResponse;
77 }
78 } 75 }
79 checkRefundStatusResponse.setRefundStatus(refundEnum.getCode());
80 checkRefundStatusResponse.setSubmessage(refundEnum.getMsg());
81 checkRefundStatusResponse.setRefundStatusdescription(refundEnum.getMsg());
82 checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
83 checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
84 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
85 return checkRefundStatusResponse;
86 } 76 }
77 checkRefundStatusResponse.setRefundStatus(refundEnum.getCode());
78 checkRefundStatusResponse.setSubmessage(refundEnum.getMsg());
79 checkRefundStatusResponse.setRefundStatusdescription(refundEnum.getMsg());
80 checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
81 checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
82 checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
83 return checkRefundStatusResponse;
84
87 } 85 }
88 //2.查询换货表有没有记录 86 //2.查询换货表有没有记录
89 List<MemberProductExchange> memberProductExchangeList = memberReadDao.getMemberProductExchangeByOrderSn(callRequest.getBizModel().getOrderID()); 87 List<MemberProductExchange> memberProductExchangeList = memberReadDao.getMemberProductExchangeByOrderSn(callRequest.getBizModel().getOrderID());
......