商品取消订单 退券

商铺拒绝退款 增加 退款次数和退款时间
用户订单详情增加 最后一次退款订单状态

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinAppOrderDetailsVo.java

@@ -31,7 +31,7 @@ public class GoblinAppOrderDetailsVo implements Serializable, Cloneable {
     private int canRefund;
     @ApiModelProperty(value = "退款订单数量")
     private int refundSize;
-    @ApiModelProperty(value = "退款订单状态[退款／退货状态[0-商铺发起退款|1-退款申请(用户发送退款请求)|2-退款成功(商家同意退款)|3-退款拒绝(商家拒绝退款)|4-退货申请(用户发起退货请求)|5-退货拒绝(商家拒绝退货)|6-退货审核通过等待用户填写物流(商家审核通过，等待用户寄回商品)|7-待收货(用户已确认)|8-退货完成(商家收货并且同意退款给用户)|9-退货失败(商家不同意退款)]")
+    @ApiModelProperty(value = "退款订单状态[退款／退货状态[-1-无状态|0-商铺发起退款|1-退款申请(用户发送退款请求)|2-退款成功(商家同意退款)|3-退款拒绝(商家拒绝退款)|4-退货申请(用户发起退货请求)|5-退货拒绝(商家拒绝退货)|6-退货审核通过等待用户填写物流(商家审核通过，等待用户寄回商品)|7-待收货(用户已确认)|8-退货完成(商家收货并且同意退款给用户)|9-退货失败(商家不同意退款)]")
     private int refundStatus;
 
     private static final GoblinAppOrderDetailsVo obj = new GoblinAppOrderDetailsVo();

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java

@@ -127,8 +127,12 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
             }
         }
         List<String> orderRefundIds = redisUtils.getBackOrderByOrderId(orderId);
-        GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(orderRefundIds.get(orderRefundIds.size()-1));
-        vo.setRefundStatus(backOrderVo.getStatus());
+        if (orderRefundIds.size() == 0) {
+            GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(orderRefundIds.get(orderRefundIds.size() - 1));
+            vo.setRefundStatus(backOrderVo.getStatus());
+        } else {
+            vo.setRefundStatus(-1);
+        }
         vo.setRefundSize(orderRefundIds.size());
         vo.setRestTime(getRestTime(orderVo));
         vo.setStoreOrderVo(orderVo);