Merge branch 'feature/20240305_门店操作部分退款_wuping' of…

Merge branch 'feature/20240305_门店操作部分退款_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -387,7 +387,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
 
     @Override
     public BaseResponse<OrderManagerResponse> partRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
-        //发起售后单，退款,同意售后
+        //发起售后单
         OrderCancelReq orderCancelReq = new OrderCancelReq();
         orderCancelReq.setPartnerId(orderBean.getCompanyId());
         orderCancelReq.setOrderCode(orderBean.getOid());
@@ -397,7 +397,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         orderCancelReq.setOrderClient(Integer.parseInt(orderBean.getOrderClient()));
         orderCancelReq.setOperator(request.getOperator());
         orderCancelReq.setOperationClient(request.getOperationClient());
-        orderCancelReq.setRefundState(AfterSalesRefunStateEnum.STATE_1.getIndex());
+        orderCancelReq.setRefundState(AfterSalesRefunStateEnum.STATE_4.getIndex());
         orderCancelReq.setIsPartRefund(true);
         orderCancelReq.setReqAmount(new BigDecimal(request.getRefundAmount()));
 
@@ -631,7 +631,10 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         if (!NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderBean.getStatusV2())) {
             orderBaseService.sendMessage(orderBean, ORDER_AGREE_REFUND, reason);
         }
-        //todo  可以考虑基于订单回调异步实现
+        //部分退款不进行冲正
+        if (Objects.nonNull(afterSalesOrderResp) && afterSalesOrderResp.getIsPartRefund()) {
+            return ResponseUtil.success();
+        }
         //冲正库存
         stockHandle.revert(omRequest, orderBean);
         return ResponseUtil.success();