提交微信支付

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/dto/DragonPayBaseRespDto.java

 package com.liquidnet.service.dragon.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -37,16 +36,12 @@ public class DragonPayBaseRespDto {
     @Data
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class PayData{
-        @JsonProperty("appId")
         private String appId;
 
-        @JsonProperty("nonceStr")
         private String nonceStr;
 
-        @JsonProperty("timeStamp")
         private String timeStamp;
 
-        @JsonProperty("package")
         private String packages;
 
         private String partnerId;

liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon-dev.yml

@@ -25,10 +25,10 @@ liquidnet:
   dragon:
     alipay:
       gataway-url: https://openapi.alipay.com/gateway.do
-      notify-url: https://testpay.zhengzai.tv/alipay
+      notify-url: https://testdragon.zhengzai.tv/dragon/notify/alipay
     wepay:
       gataway-url: https://openapi.alipay.com/gateway.do
-      notify-url: https://testpay.zhengzai.tv/wepay
+      notify-url: https://testdragon.zhengzai.tv/dragon/notify/wepay
       merchantId: 1551961491
       appId: wx3498304dda39c5a1
       parentKey: itIuO65O9yKmemOu3S8g1S4orqvCGwXK

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/req/AlipayTradePayReq.java

@@ -22,6 +22,8 @@ public class AlipayTradePayReq {
     private String body;
     private String outTradeNo;
     private String timeExpire;
+    private String notifyUrl;
+    private String timestamp;
     @Override
     public String toString(){
         return JSON.toJSONString(this);

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

@@ -42,6 +42,8 @@ public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
         //dragon中支付编号
         alipayTradePayReq.setOutTradeNo(dragonPayBaseReqDto.getCode());
         alipayTradePayReq.setTimeExpire(dragonPayBaseReqDto.getExpireTime());
+        alipayTradePayReq.setNotifyUrl(this.getNotifyUrl());
+        alipayTradePayReq.setTimestamp(dragonPayBaseReqDto.getCreateDate());
         //调用支付
         Map<String, Object> result = AlipayUtil.tradeWapPay(alipayTradePayReq);
         //拼接返回参数
@@ -58,6 +60,11 @@ public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
      */
     protected abstract void setProductCode();
 
+    /**
+     * 设置notifyUrl
+     */
+    protected abstract String getNotifyUrl();
+
     /**
      * 构造公共返回参数
      * @param dragonPayBaseReqDto

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

@@ -25,6 +25,9 @@ public class AlipayStrategyAppImpl extends AbstractAlipayStrategy {
     @Value("${liquidnet.dragon.alipay.gataway-url}")
     private String alipayGatewayUrl;
 
+    @Value("${liquidnet.dragon.alipay.notify-url}")
+    private String notifyUrl;
+
     @Autowired
     StringRedisTemplate stringRedisTemplate;
 
@@ -32,9 +35,15 @@ public class AlipayStrategyAppImpl extends AbstractAlipayStrategy {
         this.productCode = "QUICK_MSECURITY_PAY";
     }
 
+    @Override
+    protected String getNotifyUrl() {
+        // notifyUrl = "/notify/app/alipay/1";
+        return notifyUrl + "/app";
+    }
+
     @Override
     DragonPayBaseRespDto buildResponseDto(DragonPayBaseRespDto payBaseRespDto, Map<String, Object> respResult) {
-        payBaseRespDto.getPayData().setRedirectUrl(alipayGatewayUrl + "?" + respResult.get("body"));
+        payBaseRespDto.getPayData().setOrderStr(alipayGatewayUrl + "?" + respResult.get("order_string"));
         return payBaseRespDto;
     }
 }
\ No newline at end of file

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

@@ -25,6 +25,9 @@ public class AlipayStrategyWapImpl extends AbstractAlipayStrategy {
     @Value("${liquidnet.dragon.alipay.gataway-url}")
     private String alipayGatewayUrl;
 
+    @Value("${liquidnet.dragon.alipay.notify-url}")
+    private String notifyUrl;
+
     @Autowired
     StringRedisTemplate stringRedisTemplate;
 
@@ -32,6 +35,12 @@ public class AlipayStrategyWapImpl extends AbstractAlipayStrategy {
         this.productCode = "QUICK_WAP_PAY";
     }
 
+    @Override
+    protected String getNotifyUrl() {
+//        notifyUrl = "/notify/wap/alipay/1";
+        return notifyUrl + "/wap";
+    }
+
     @Override
     DragonPayBaseRespDto buildResponseDto(DragonPayBaseRespDto payBaseRespDto, Map<String, Object> respResult) {
         payBaseRespDto.getPayData().setRedirectUrl(alipayGatewayUrl + "?" + respResult.get("body"));

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

 package com.liquidnet.service.dragon.channel.strategy.impl;
 
+import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.dragon.channel.alipay.strategy.AlipayStrategyContext;
 import com.liquidnet.service.dragon.channel.strategy.IPayChannelStrategy;
 import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
 import com.liquidnet.service.dragon.channel.wepay.strategy.WepayStrategyContext;
@@ -11,9 +11,6 @@ import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author AnJiabin <jiabin.an@lightnet.io>
  * @version V1.0
@@ -31,6 +28,7 @@ public class PayChannelStrategyWepayImpl implements IPayChannelStrategy {
 
     @Override
     public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        dragonPayBaseReqDto.setCode(IDGenerator.payCode());
         return wepayStrategyContext.getStrategy(dragonPayBaseReqDto.getDeviceFrom()).dragonPay(dragonPayBaseReqDto);
     }
 }

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

@@ -101,7 +101,7 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         parameters.put("detail", dragonPayBaseReqDto.getDetail());
         parameters.put("out_trade_no", IDGenerator.payCode());
         parameters.put("time_expire", "20210908103456");
-        parameters.put("notify_url", "https://www.baidu.com");
+        parameters.put("notify_url", dragonPayBaseReqDto.getNotifyUrl());
         parameters.put("trade_type", "MWEB");
         return parameters;
     };