修复订单退款状态

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/OmsOrderService.java

@@ -51,6 +51,11 @@ public interface OmsOrderService extends IService<OmsOrder>
      */
     void cancelOrder(Long orderId);
 
+    /**
+     * 修改订单状态
+     */
+    void updateOrderStatus(Long orderId,Integer status);
+
     /**
      * 发送延迟消息取消订单
      */

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -12,9 +12,11 @@ import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyPagingParam;
 import com.chelvc.cloud.vehicle.server.copier.OrderReturnApplyCopier;
 import com.chelvc.cloud.vehicle.server.dao.OmsOrderReturnApplyMapper;
+import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply;
 import com.chelvc.cloud.vehicle.server.service.MerchantService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderReturnApplyService;
+import com.chelvc.cloud.vehicle.server.service.OmsOrderService;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
@@ -43,6 +45,8 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
 {
     private final MerchantService merchantService;
 
+    private final OmsOrderService omsOrderService;
+
     /**
      * 查询订单退货申请
      *
@@ -82,6 +86,7 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
         OmsOrderReturnApply omsOrderReturnApply = OrderReturnApplyCopier.INSTANCE.copying(param);
         omsOrderReturnApply.setCreateTime(new Date());
         this.save(omsOrderReturnApply);
+        this.omsOrderService.updateOrderStatus(param.getOrderId(),6);
         return omsOrderReturnApply.getId();
     }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -316,7 +316,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
             history.setCreateTime(LocalDateTime.now());
             histories.add(history);
         }
-        this.baseMapper.updateOrderStatus(ids, 5);
+        this.baseMapper.updateOrderStatus(ids, 6);
         omsOrderOperateHistoryService.batchInsertOmsOrderOperateHistory(histories);
         for (OmsOrderDetailDTO timeOutOrder : timeOutOrders) {
             //解除订单商品库存锁定
@@ -366,7 +366,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
             //修改订单状态为交易取消
             List<Long> ids = new ArrayList<>();
             ids.add(cancelOrder.getId());
-            this.baseMapper.updateOrderStatus(ids, 5);
+            this.baseMapper.updateOrderStatus(ids, 6);
             omsOrderOperateHistoryService.insertOmsOrderOperateHistory(cancelOrder.getId(), cancelOrder.getUserId(), 5);
             OmsOrderItem orderItem = new OmsOrderItem();
             orderItem.setOrderId(orderId);
@@ -920,4 +920,16 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         LocalDateTime endLocalTime = DateTimeUtils.getLastMonthEndLocalTime();
         return omsOrderMapper.queryAmountByLastMonth(merchantId, startLocalTime, endLocalTime);
     }
+
+
+    @Override
+    public void updateOrderStatus(Long orderId,Integer status) {
+        try{
+            List<Long> orderIds = new ArrayList<>();
+            orderIds.add(orderId);
+            this.baseMapper.updateOrderStatus(orderIds, 5);
+        }catch (Exception e){
+            e.getStackTrace();
+        }
+    }
 }