记得上下班打卡 | git大法好,push需谨慎

Commit 6410bdd0 authored by 胡佳晨's avatar 胡佳晨

退款申请拦截

parent bbe6b3ae
...@@ -141,7 +141,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService { ...@@ -141,7 +141,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
vo.setRefundStatus(-1); vo.setRefundStatus(-1);
} }
List<GoblinMailVo> mailVos = redisUtils.getGoblinMail(orderId); List<GoblinMailVo> mailVos = redisUtils.getGoblinMail(orderId);
for (GoblinMailVo mailVo:mailVos){ for (GoblinMailVo mailVo : mailVos) {
mailVo.setOrderSkuVos(null); mailVo.setOrderSkuVos(null);
mailVo.setOrderSkuVoIds(null); mailVo.setOrderSkuVoIds(null);
} }
...@@ -218,6 +218,15 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService { ...@@ -218,6 +218,15 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
if (!orderVo.getUserId().equals(uid)) { if (!orderVo.getUserId().equals(uid)) {
return ResponseDto.failure("无权操作"); return ResponseDto.failure("无权操作");
} }
List<String> backOrderIds = redisUtils.getBackOrderByOrderId(param.getOrderId());
for (String backOrderId : backOrderIds) {
GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(backOrderId);
if (!(backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_3.getValue()) || backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_5.getValue()) || backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_9.getValue()))) {
return ResponseDto.failure("申请失败");
}
}
if (!(orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue() || if (!(orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue() ||
// orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_3.getValue() || // orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_3.getValue() ||
orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue())) { orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment