超市支付退款 相关配置

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -90,7 +90,12 @@ liquidnet:
       url: http://devstone.zhengzai.tv/stone
     dragon:
       notifyUrl: https://devdragon.zhengzai.tv/dragon
+      urls:
+        refundApply: https://devdragon.zhengzai.tv/dragon/refund/refundSingle
+        refundResult: https://devdragon.zhengzai.tv/dragon/refund/refund/alipay/result
     platform:
+      urls:
+        refundNotify: https://devplatform.zhengzai.tv/platform/refund/callback
       url: http://devplatform.zhengzai.tv
     sweet:
       url: http://devsweet.zhengzai.tv

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -92,7 +92,12 @@ liquidnet:
         localUrl: http://testorder.zhengzai.tv/order/order/syncOrder
     dragon:
       notifyUrl: https://testdragon.zhengzai.tv/dragon
+      urls:
+        refundApply: https://devdragon.zhengzai.tv/dragon/refund/refundSingle
+        refundResult: https://devdragon.zhengzai.tv/dragon/refund/refund/alipay/result
     platform:
+      urls:
+        refundNotify: https://devplatform.zhengzai.tv/platform/refund/callback
       url: http://testplatform.zhengzai.tv
     sweet:
       url: http://testsweet.zhengzai.tv

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/pom.xml

@@ -83,11 +83,6 @@
             <artifactId>liquidnet-api-feign-stone</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-client-admin-zhengzai</artifactId>
-            <version>4.6.1</version>
-        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java

@@ -2,13 +2,10 @@ package com.liquidnet.service.platform.service.refund;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.client.admin.zhengzai.kylin.utils.TaobaoTicketUtils;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
@@ -50,14 +47,13 @@ import java.util.List;
 @Slf4j
 @Service
 public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefundsMapper, KylinOrderRefunds> implements IKylinOrderRefundsService {
-    @Value("${liquidnet.client.admin.platformUrl}")
-    private String platformUrl;
-    @Value("${liquidnet.client.admin.phpPayUrl}")
-    private String phpPayUrl;
-    @Value("${liquidnet.url-refund.apply}")
-    private String applyUrl;
-    @Value("${liquidnet.url-refund.notify}")
-    private String notifyUrl;
+
+    @Value("${liquidnet.service.dragon.urls.refundApply}")
+    private String refundApply;
+    @Value("${liquidnet.service.dragon.urls.refundResult}")
+    private String refundResult;
+    @Value("${liquidnet.service.platform.urls.refundNotify}")
+    private String refundNotify;
 
     @Autowired
     private KylinRefundsStatusServiceImpl kylinRefundsStatusServiceImpl;
@@ -76,8 +72,8 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     @Autowired
     private DataUtils dataUtils;
 
-    @Autowired
-    private TaobaoTicketUtils taobaoTicketUtils;
+    /*@Autowired
+    private TaobaoTicketUtils taobaoTicketUtils;*/
 
     public String refundCallback(RefundCallbackParam refundCallbackParam) {
         log.info("refundCallback订单退款回调参数: [RefundCallbackParam={}]", refundCallbackParam);
@@ -161,7 +157,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             if (null != orderInfo.getPaymentType() && (orderInfo.getPaymentType().equals("WAPALIPAY") || orderInfo.getPaymentType().equals("APPALIPAY"))) {
                 log.info("\n支付宝退款主动查询处理结果：\n[{}] ", orderInfo.getOrderTicketsId());
                 MultiValueMap<String, String> params = new LinkedMultiValueMap();
-                params.add("callBackUrl", platformUrl.concat("/platform/refund/callback"));
+                params.add("callBackUrl", refundNotify);
                 params.add("orderCode", orderInfo.getOrderCode());
                 params.add("orderRefundCode", refundInfo.getOrderRefundCode());
                 params.add("paymentId", orderInfo.getPaymentId());
@@ -170,7 +166,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
                 log.info("\n支付宝退款主动查询参数：\n[{}] ", params.toString());
                 // 请求pay
                 try {
-                    String postResult = HttpUtil.post(phpPayUrl.concat("/dragon/refund/refund/alipay/result"), params);
+                    String postResult = HttpUtil.post(refundApply, params);
                     log.info("\n支付宝退款主动查询处理结果：\n[{}] " + postResult);
                 } catch (Exception e) {
                     log.info("\n支付宝退款主动查询失败：[errorMsg=[{}], [orderRefundsId=[{}]", e.getMessage(), refundInfo.getOrderRefundsId());
@@ -232,7 +228,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             BigDecimal refundPrice = refundInfo.getPrice().add(refundInfo.getPriceExpress());
             MultiValueMap<String, String> params = new LinkedMultiValueMap();
             params.add("code", oderInfo.getPayCode());
-            params.add("notifyUrl", notifyUrl);
+            params.add("notifyUrl", refundNotify);
             params.add("orderCode", oderInfo.getOrderCode());
             params.add("orderRefundCode", refundInfo.getOrderRefundCode());
             params.add("paymentId", oderInfo.getPaymentId());
@@ -247,7 +243,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             // 请求pay
             String postResult = null;
             try {
-                postResult = HttpUtil.post(applyUrl, params, headers);
+                postResult = HttpUtil.post(refundApply, params, headers);
                 log.info("退款res" + postResult);
                 HashMap hashMapResult = JsonUtils.fromJson(postResult, HashMap.class);
                 Boolean success = (Boolean) hashMapResult.get("success");
@@ -282,9 +278,9 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
                     continue;
                 } else {
                     // 同步大麦退款
-                    KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderId);
+                    /*KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderId);
                     KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
-                    taobaoTicketUtils.refundDamaiOrder(orderData, vo);
+                    taobaoTicketUtils.refundDamaiOrder(orderData, vo);*/
                 }
             } catch (Exception e) {
                 log.info("退款请求pay失败e" + e.getMessage());