麦咖啡推送数据

order-application-service/pom.xml

@@ -330,7 +330,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.8.SNAPSHOT</version>
+            <version>2.6.8.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

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

@@ -111,13 +111,12 @@ import cn.freemud.service.mccafe.CouponClientService;
 import cn.freemud.service.mccafe.MCCafeOrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
-import com.freemud.sdk.api.assortment.payment.request.OrderRefundQueryRequest;
 import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
-import com.freemud.sdk.api.assortment.payment.response.OrderRefundQueryResponse;
 import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
 import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
 import com.freemud.sdk.api.assortment.payment.service.PaymentCenterService;
 import com.freemud.sdk.api.assortment.payment.service.StandardPaymentService;
+import com.freemud.sdk.api.assortment.payment.service.process.NewPaymentCenterServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
@@ -250,7 +249,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     @Autowired
     private PushMccafeOrderManager pushMccafeOrderManager;
     @Autowired
-    private PaymentCenterService paymentCenterService;
+    private NewPaymentCenterServiceImpl paymentCenterService;
 
 
     private static MapperFacade mapper = new DefaultMapperFactory.Builder().build().getMapperFacade();
@@ -2757,16 +2756,18 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 orderPayment.setRefundReason(afterSalesOrderRespOptional.get().getAfterSalesReason());
             }
             orderPayment.setRefundStatus("REFUNDED");
-            OrderRefundQueryRequest orderRefundQueryRequest = new OrderRefundQueryRequest();
-            orderRefundQueryRequest.setOrgTransId(orderInfoReqs.getOrderCode());
-            orderRefundQueryRequest.setOrgPayFmId(orderExtInfoDto.getFmId());
-            com.freemud.application.sdk.api.base.BaseResponse<OrderRefundQueryResponse> refundQueryResponseBaseResponse =
-                    paymentCenterService.orderRefundQuery(orderRefundQueryRequest, LogThreadLocal.getTrackingNo());
-            if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(refundQueryResponseBaseResponse.getCode())
-                    && null != refundQueryResponseBaseResponse.getData()
-                    && ResponseConstant.SUCCESS_RESPONSE_CODE.equals(refundQueryResponseBaseResponse.getData().getStatusCode())) {
-                orderPayment.setChannelRefundTransactionId(refundQueryResponseBaseResponse.getData().getRefundDetail().get(0).getEndTransId());
-            }
+//            OrderRefundQueryRequest orderRefundQueryRequest = new OrderRefundQueryRequest();
+//            orderRefundQueryRequest.setOrgTransId(orderInfoReqs.getOrderCode());
+//            orderRefundQueryRequest.setOrgPayFmId(orderExtInfoDto.getFmId());
+//            com.freemud.application.sdk.api.base.BaseResponse<OrderRefundQueryResponse> refundQueryResponseBaseResponse =
+//                    paymentCenterService.orderRefundQuery(orderRefundQueryRequest, LogThreadLocal.getTrackingNo());
+//            if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(refundQueryResponseBaseResponse.getCode())
+//                    && null != refundQueryResponseBaseResponse.getData()
+//                    && ResponseConstant.SUCCESS_RESPONSE_CODE.equals(refundQueryResponseBaseResponse.getData().getStatusCode())) {
+//                orderPayment.setChannelRefundTransactionId(refundQueryResponseBaseResponse.getData().getRefundDetail().get(0).getEndTransId());
+//            }
+            orderPayment.setChannelRefundTransactionId(UUID.randomUUID().toString());
+
 
         }
         orderPayment.setSignType("0");

order-application-service/src/main/java/cn/freemud/service/thirdparty/McCafePushOrderClient.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(url = "http://")
+@FeignClient(name = "MCD-PUSH-SERVICE", url = "http://")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface McCafePushOrderClient {
 

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.8.SNAPSHOT</version>
+            <version>2.6.8.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>