结局类型冲突

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -46,6 +46,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
+import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.BuriedPointService;
 import cn.freemud.service.CouponActivityService;
@@ -133,7 +134,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.util.StringUtil;
 
@@ -254,8 +254,6 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private DeliveryFeiginClient deliveryFeiginClient;
     @Autowired
-    private RedisTemplate redisTemplate;
-    @Autowired
     private MulitiPaymentClient mulitiPaymentClient;
 
     @Override

order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java

 package cn.freemud.service.impl;
 
-import cn.freemud.service.thirdparty.MulitiPaymentClient;
+import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
 import org.junit.Test;

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -5,7 +5,7 @@ import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.intercept.OrderServiceException;
-import cn.freemud.management.thirdparty.MulitiOrderPaymentClient;
+import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import cn.freemud.management.util.RedisUtil;
 import cn.freemud.redis.RedisCache;
 import com.freemud.application.sdk.api.base.BaseResponse;
@@ -53,7 +53,7 @@ public class PaymentHandle {
     @Autowired
     private OrderSdkService orderSdkService;
     @Autowired
-    private MulitiOrderPaymentClient mulitiOrderPaymentClient;
+    private MulitiPaymentClient mulitiPaymentClient;
     @Autowired
     private RedisCache redisCache;
     /**
@@ -145,7 +145,7 @@ public class PaymentHandle {
     public PayRefundResponse multiRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){
         PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
         MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean);
-        MultiOrderRefundResponse<MultiOrderRefundResponse.Data> multiOrderRefundResponse = mulitiOrderPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());
+        MultiOrderRefundResponse<MultiOrderRefundResponse.Data> multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());
         if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
             throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);
         }

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

-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @Title: OrderClient
- * @Package cn.freemud.service.thirdparty
- * @Description:
- * @author: liming.guo
- * @date: 2018/8/10 16:06
- * @version V1.0
- * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
-package cn.freemud.management.thirdparty;
-
-
-import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
-import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@FeignClient(name = "payment-center-application-api",url = "${saas.paymentcenter.application.api.feign.url}")
-@RequestMapping(produces = {"application/json;charset=UTF-8"})
-public interface MulitiOrderPaymentClient {
-
-    /**
-     * 统一活动查询接口
-     */
-    @PostMapping("/payment/application/refund")
-    MultiOrderRefundResponse paymentApplicationRefund(MultiOrderRefundRequest multiOrderRefundRequest, @RequestHeader("partnerId") String partnerId);
-
-}

order-application-service/src/main/java/cn/freemud/service/thirdparty/MulitiPaymentClient.java → order-management/src/main/java/cn/freemud/management/thirdparty/MulitiPaymentClient.java

@@ -10,7 +10,7 @@
  * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-package cn.freemud.service.thirdparty;
+package cn.freemud.management.thirdparty;
 
 
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;