申请退款 增加类型判断

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

@@ -240,21 +240,28 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
             backOrder.setPics(param.getPics());
             backOrder.setDescribes(param.getDescribes());
             backOrder.setSkuIdNums(Joiner.on(",").join(orderVo.getOrderSkuVoIds()));
-        } else {//已发货
+        } else if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_3.getValue()) {//已发货
             GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(param.getOrderSkuId());
-            backOrder.setRealBackPrice(orderSkuVo.getSkuPriceActual());
-            backOrder.setBackPriceExpress(orderVo.getPriceExpress());
+            if(orderVo.getPriceRefund().add(orderSkuVo.getSkuPriceActual()).add(orderVo.getPriceExpress()).compareTo(orderVo.getPriceActual())>=0){
+                backOrder.setRealBackPrice(orderSkuVo.getSkuPriceActual().add(orderVo.getPriceExpress()));
+                backOrder.setBackPriceExpress(orderVo.getPriceExpress());
+            }else{
+                backOrder.setRealBackPrice(orderSkuVo.getSkuPriceActual());
+                backOrder.setBackPriceExpress(BigDecimal.ZERO);
+            }
             backOrder.setReason(param.getReason());
             backOrder.setPics(param.getPics());
             backOrder.setDescribes(param.getDescribes());
             backOrder.setType(param.getRefundType());
             backOrder.setSkuIdNums(param.getOrderSkuId());
+        } else {
+            return ResponseDto.failure("不可申请");
         }
         GoblinBackOrderVo vo = GoblinBackOrderVo.getNew();
         BeanUtils.copyProperties(backOrder, vo);
         vo.setCreatedAt(nowStr);
         List<GoblinBackOrderSkuVo> orderSkuVoList = ObjectUtil.goblinBackOrderSkuVoArrayList();
-        if (param.getOrderSkuId() == null) {
+        if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue()) {
             //订单状态修改
 //            orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_61.getValue());
             orderStatus.add(new Object[]{
@@ -285,7 +292,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                         orderSkuVo.getOrderSkuId(), now, now
                 });
             }
-        } else {
+        } else if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_3.getValue() && param.getOrderSkuId() != null) {
             GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(param.getOrderSkuId());
             //订单款式状态修改
             orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_61.getValue());
@@ -309,6 +316,8 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                     orderSkuVo.getStatus(), now,
                     orderSkuVo.getOrderSkuId(), now, now
             });
+        } else {
+            return ResponseDto.failure("不可申请");
         }
         vo.setBackOrderSkuVos(orderSkuVoList);
         //添加日志

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

@@ -111,6 +111,9 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             return ResponseDto.failure("无法查看");
         }
         GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
+        if (orderVo == null || !orderVo.getStoreId().equals(storeInfoVo.getStoreId())) {
+            return ResponseDto.failure("无法查看");
+        }
         GoblinStoreOrderListVo vo = GoblinStoreOrderListVo.getNew();
         vo.setCreatedAt(orderVo.getCreatedAt());
         vo.setExpressAddressDetail(orderVo.getOrderAttrVo().getExpressAddressDetail());