提交微信支付

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/strategy/impl/AlipayStrategyAppImpl.java

@@ -26,7 +26,7 @@ import java.util.Map;
 @Component
 @StrategyAlipayHandler(DragonConstant.DeviceFromEnum.APP)
 public class AlipayStrategyAppImpl extends AbstractAlipayStrategy {
-    @Value("${liquidnet.dragon.url}")
+    @Value("${liquidnet.dragon.alipay.gataway-url}")
     private String alipayGatewayUrl;
 
     @Value("${liquidnet.dragon.url}")
@@ -47,7 +47,7 @@ public class AlipayStrategyAppImpl extends AbstractAlipayStrategy {
     @Override
     protected String getNotifyUrl() {
         // notifyUrl = "/notify/app/alipay/1";
-        return notifyUrl + "/app";
+        return notifyUrl + "/notify/alipay/app";
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/strategy/impl/AlipayStrategyWapImpl.java

@@ -26,7 +26,7 @@ import java.util.Map;
 @Service
 @StrategyAlipayHandler(DragonConstant.DeviceFromEnum.WAP)
 public class AlipayStrategyWapImpl extends AbstractAlipayStrategy {
-    @Value("${liquidnet.dragon.url}")
+    @Value("${liquidnet.dragon.alipay.gataway-url}")
     private String alipayGatewayUrl;
 
     @Value("${liquidnet.dragon.url}")
@@ -47,7 +47,7 @@ public class AlipayStrategyWapImpl extends AbstractAlipayStrategy {
     @Override
     protected String getNotifyUrl() {
 //        notifyUrl = "/notify/wap/alipay/1";
-        return notifyUrl + "/wap";
+        return notifyUrl + "/notify/alipay/wap";
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/AbstractWepayStrategy.java

@@ -106,8 +106,8 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         parameters.put("body", dragonPayBaseReqDto.getName());
         parameters.put("detail", dragonPayBaseReqDto.getDetail());
         parameters.put("out_trade_no", dragonPayBaseReqDto.getCode());
-        parameters.put("time_expire", "20210908103456");
-        parameters.put("notify_url", dragonPayBaseReqDto.getNotifyUrl());
+        parameters.put("time_expire", "203110908103456");
+        parameters.put("notify_url", this.getNotifyUrl());
         return parameters;
     };
 
@@ -128,4 +128,9 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
      * @return
      */
     protected abstract String getRequestUrl();
+
+    /**
+     * 设置notifyUrl
+     */
+    protected abstract String getNotifyUrl();
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/WepayStrategyAppImpl.java

@@ -5,6 +5,7 @@ import com.liquidnet.service.dragon.channel.wepay.strategy.annotation.StrategyWe
 import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.SortedMap;
@@ -22,6 +23,9 @@ import java.util.SortedMap;
 @Component
 @StrategyWepayHandler(DragonConstant.DeviceFromEnum.APP)
 public class WepayStrategyAppImpl extends AbstractWepayStrategy {
+    @Value("${liquidnet.dragon.url}")
+    private String notifyUrl;
+
     @Override
     SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
         requestMap.put("trade_type", "APP");
@@ -38,4 +42,9 @@ public class WepayStrategyAppImpl extends AbstractWepayStrategy {
     protected String getRequestUrl() {
         return "https://api.mch.weixin.qq.com/pay/unifiedorder";
     }
+
+    @Override
+    protected String getNotifyUrl() {
+        return notifyUrl + "/notify/wepay/app";
+    }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/WepayStrategyAppletImpl.java

@@ -5,6 +5,7 @@ import com.liquidnet.service.dragon.channel.wepay.strategy.annotation.StrategyWe
 import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.SortedMap;
@@ -22,6 +23,9 @@ import java.util.SortedMap;
 @Component
 @StrategyWepayHandler(DragonConstant.DeviceFromEnum.APPLET)
 public class WepayStrategyAppletImpl extends AbstractWepayStrategy{
+    @Value("${liquidnet.dragon.url}")
+    private String notifyUrl;
+
     @Override
     SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
         requestMap.put("trade_type", "JSAPI");
@@ -39,4 +43,9 @@ public class WepayStrategyAppletImpl extends AbstractWepayStrategy{
     protected String getRequestUrl() {
         return "https://api.mch.weixin.qq.com/pay/unifiedorder";
     }
+
+    @Override
+    protected String getNotifyUrl() {
+        return notifyUrl + "/notify/wepay/applet";
+    }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/WepayStrategyJsImpl.java

@@ -5,6 +5,7 @@ import com.liquidnet.service.dragon.channel.wepay.strategy.annotation.StrategyWe
 import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.SortedMap;
@@ -22,6 +23,9 @@ import java.util.SortedMap;
 @Component
 @StrategyWepayHandler(DragonConstant.DeviceFromEnum.JS)
 public class WepayStrategyJsImpl extends AbstractWepayStrategy{
+    @Value("${liquidnet.dragon.url}")
+    private String notifyUrl;
+
     @Override
     SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
         requestMap.put("trade_type", "JSAPI");
@@ -39,4 +43,9 @@ public class WepayStrategyJsImpl extends AbstractWepayStrategy{
     protected String getRequestUrl() {
         return "https://api.mch.weixin.qq.com/pay/unifiedorder";
     }
+
+    @Override
+    protected String getNotifyUrl() {
+        return notifyUrl + "/notify/wepay/js";
+    }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/WepayStrategyWapImpl.java

@@ -5,6 +5,7 @@ import com.liquidnet.service.dragon.channel.wepay.strategy.annotation.StrategyWe
 import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.SortedMap;
@@ -22,6 +23,9 @@ import java.util.SortedMap;
 @Component
 @StrategyWepayHandler(DragonConstant.DeviceFromEnum.WAP)
 public class WepayStrategyWapImpl extends AbstractWepayStrategy{
+    @Value("${liquidnet.dragon.url}")
+    private String notifyUrl;
+
     @Override
     SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
         requestMap.put("trade_type", "MWEB");
@@ -38,4 +42,9 @@ public class WepayStrategyWapImpl extends AbstractWepayStrategy{
     protected String getRequestUrl() {
         return "https://api.mch.weixin.qq.com/pay/unifiedorder";
     }
+
+    @Override
+    protected String getNotifyUrl() {
+        return notifyUrl + "/notify/wepay/wap";
+    }
 }