订单详情 退款逻辑修改

退款订单列表 状态文档

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

@@ -130,11 +130,11 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         if (orderRefundIds.size() > 0) {
             GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(orderRefundIds.get(orderRefundIds.size() - 1));
             vo.setRefundStatus(backOrderVo.getStatus());
-            if(vo.getCanRefund()==1&&
-                    (backOrderVo.getStatus()==2||backOrderVo.getStatus()==3||backOrderVo.getStatus()==5)&&
-                    (vo.getStoreOrderVo().getStatus()==GoblinStatusConst.Status.ORDER_STATUS_2.getValue() || vo.getStoreOrderVo().getStatus()==GoblinStatusConst.Status.ORDER_STATUS_4.getValue())){
+            if (vo.getCanRefund() == 1 &&
+                    (backOrderVo.getStatus() == 2 || backOrderVo.getStatus() == 3 || backOrderVo.getStatus() == 5) &&
+                    (vo.getStoreOrderVo().getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue() || vo.getStoreOrderVo().getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue())) {
 
-            }else{
+            } else {
                 vo.setCanRefund(0);
             }
         } else {
@@ -247,7 +247,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
             backOrder.setPics(param.getPics());
             backOrder.setDescribes(param.getDescribes());
             backOrder.setSkuIdNums(Joiner.on(",").join(orderVo.getOrderSkuVoIds()));
-        } else if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_3.getValue()) {//已发货
+        } else if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue() && param.getOrderSkuId() != null) {//已完成
             GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(param.getOrderSkuId());
             if (orderVo.getPriceRefund().add(orderSkuVo.getSkuPriceActual()).add(orderVo.getPriceExpress()).compareTo(orderVo.getPriceActual()) >= 0) {
                 backOrder.setRealBackPrice(orderSkuVo.getSkuPriceActual().add(orderVo.getPriceExpress()));