Merge branch 'feature/box/三方券订单退款退券' into qa

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

 package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.base.util.DateUtil;
 import cn.freemud.management.adapter.OrderCancelReqAdapter;
 import cn.freemud.management.constant.ResponseCodeConstant;
 import cn.freemud.management.entities.dto.request.console.*;
@@ -16,10 +15,7 @@ import cn.freemud.management.handler.AssisantApplicationHandler;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.*;
-import cn.freemud.management.thirdparty.ConsoleApiClient;
-import cn.freemud.management.thirdparty.CouponBackstageClient;
-import cn.freemud.management.thirdparty.EcologyAdapterClient;
-import cn.freemud.management.thirdparty.OrderCallbackClient;
+import cn.freemud.management.thirdparty.*;
 import cn.freemud.management.thirdparty.request.coupon.ReverseThirdCouponRedeemReportReq;
 import cn.freemud.management.thirdparty.request.ecology.adapter.CancelRedeemCouponRequest;
 import cn.freemud.management.thirdparty.response.Result;
@@ -115,7 +111,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     private EcologyAdapterClient ecologyAdapterClient;
 
     @Autowired
-    private CouponBackstageClient couponBackstageClient;
+    private CouponOfflineClient couponOfflineClient;
 
     /**
      * 接单
@@ -358,7 +354,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             couponRequest.setChannel(coupon.getChannel());
             couponRequest.setOrderCode(request.getOrderId());
             couponRequest.setRedeemStatus(ThirdCouponReportStatusEnum.SUCCESS.getStatus());
-            SaasResponse<Object> reverseResp = couponBackstageClient.reverseThirdCouponRedeemReport(couponRequest);
+            SaasResponse<Object> reverseResp = couponOfflineClient.reverseThirdCouponRedeemReport(couponRequest);
             ApiLog.infoMessage("冲正三方券记录明细:req:{},resp:{}", JSONObject.toJSONString(couponRequest), JSONObject.toJSONString(reverseResp));
         } catch (Exception e) {
             ErrorLog.errorDev("冲正三方券记录明细异常:", e, e.getMessage());

order-management/src/main/java/cn/freemud/management/thirdparty/CouponBackstageClient.java

@@ -34,12 +34,4 @@ public interface CouponBackstageClient {
     @PostMapping("thirdChannelCoupon/redeemReport/query")
     SaasResponse<SaasPageResponse<RedeemReportQueryResponse>> queryCodesInfo(RedeemReportQueryRequest request);
 
-    /**
-     * 冲正三方券核销明细
-     * <pre></pre>
-     * @param couponRequest
-     * @return
-     */
-    @PostMapping(value = "/thirdChannelCoupon/redeemReport/reverse")
-    SaasResponse<Object> reverseThirdCouponRedeemReport(ReverseThirdCouponRedeemReportReq couponRequest);
 }