退款配置urls整理 还有会员退款

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -66,9 +66,9 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
     @Autowired
     private RedisDataSourceUtil redisDataSourceUtil;
 
-    @Value("${liquidnet.url-refund.apply}")
+    @Value("${liquidnet.service.dragon.urls.refundApply}")
     private String applyUrl;
-    @Value("${liquidnet.url-refund.notify-member}")
+    @Value("${liquidnet.service.platform.urls.memberRefundNotify}")
     private String notifyUrl;
 
     @Override

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -55,10 +55,10 @@ import java.util.stream.Collectors;
 @Service
 public class KylinRefundsStatusServiceImpl {
 
-    @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.platform.urls.ticketRefundNotify}")
+    private String refundNotify;
 
     @Autowired
     private KylinOrderTicketsMapper kylinOrderTicketsMapper;
@@ -426,7 +426,7 @@ public class KylinRefundsStatusServiceImpl {
             BigDecimal refundPrice = refund.getPrice().add(refund.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", refund.getOrderRefundCode());
             params.add("paymentId", oderInfo.getPaymentId());
@@ -442,7 +442,7 @@ public class KylinRefundsStatusServiceImpl {
             // 请求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");
@@ -510,8 +510,8 @@ public class KylinRefundsStatusServiceImpl {
         headers.add("Accept", "application/json;charset=UTF-8");
 
         log.info("订单主动完成退款orderTicketRefunded：[refundCallbackParam={}, [orderRefundCode={}, notifyUrl={}]",
-                refundCallbackParam, refundInfo.getOrderRefundCode(), notifyUrl);
-        String returnData = HttpUtil.post(notifyUrl, params, headers);
+                refundCallbackParam, refundInfo.getOrderRefundCode(), refundNotify);
+        String returnData = HttpUtil.post(refundNotify, params, headers);
         log.info("订单主动完成退款orderTicketRefunded-platform结果：{}", returnData);
 
         return true;

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

@@ -95,7 +95,8 @@ liquidnet:
         refundResult: https://devdragon.zhengzai.tv/dragon/refund/refund/alipay/result
     platform:
       urls:
-        refundNotify: https://devplatform.zhengzai.tv/platform/refund/callback
+        ticketRefundNotify: https://devplatform.zhengzai.tv/platform/refund/callback
+        memberRefundNotify: https://devplatform.zhengzai.tv/platform/amorder/callack/refund
       url: http://devplatform.zhengzai.tv
     sweet:
       url: http://devsweet.zhengzai.tv

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

@@ -97,7 +97,8 @@ liquidnet:
         refundResult: https://testdragon.zhengzai.tv/dragon/refund/refund/alipay/result
     platform:
       urls:
-        refundNotify: https://testplatform.zhengzai.tv/platform/refund/callback
+        ticketRefundNotify: https://testplatform.zhengzai.tv/platform/refund/callback
+        memberRefundNotify: https://testplatform.zhengzai.tv/platform/amorder/callack/refund
       url: http://testplatform.zhengzai.tv
     sweet:
       url: http://testsweet.zhengzai.tv

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -15,10 +15,6 @@ ruoyi:
 
 #系统自定义配置
 liquidnet:
-    url-refund:
-      apply: "${liquidnet.client.admin.phpPayUrl}/dragon/refund/refundSingle"
-      notify: "${liquidnet.client.admin.platformUrl}/platform/refund/callback"
-      notify-member: ${liquidnet.client.admin.platformUrl}/platform/amorder/callack/refund
     url-banner:
       url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)" #票务
       url7: "${liquidnet.client.admin.phpMallUrl}/admin/goodListForQuick?page=1&per_page=50" #商品

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

@@ -52,7 +52,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     private String refundApply;
     @Value("${liquidnet.service.dragon.urls.refundResult}")
     private String refundResult;
-    @Value("${liquidnet.service.platform.urls.refundNotify}")
+    @Value("${liquidnet.service.platform.urls.ticketRefundNotify}")
     private String refundNotify;
 
     @Autowired