fix: 支付模块调整和对接
This commit is contained in:
caiyuchao
@@ -1,6 +1,5 @@
|
||||
# spring配置
|
||||
spring:
|
||||
|
||||
redis:
|
||||
host: wfc-redis
|
||||
port: 6379
|
||||
@@ -55,76 +54,13 @@ mybatis-plus:
|
||||
logic-delete-value: 1
|
||||
logic-not-delete-value: 0
|
||||
|
||||
wxpay:
|
||||
appId: 121412414112
|
||||
mchId: 1131412414
|
||||
mchKey: 1525342aa
|
||||
subAppId: #服务商模式下的子商户公众账号ID
|
||||
subMchId: #服务商模式下的子商户号
|
||||
keyPath: /opt/wfc/conf/wxpay/wxpay_key.pem
|
||||
useSandboxEnv: false
|
||||
|
||||
alipay:
|
||||
appId: 121412414112
|
||||
privateKey: 1131412414
|
||||
publicKey: 1525342aa
|
||||
notifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/alipay/notify
|
||||
returnUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/alipay/return
|
||||
signType: RSA2
|
||||
charset: utf-8
|
||||
gatewayUrl: https://openapi.alipaydev.com/gateway.do
|
||||
logPath: /opt/wfc/logs/alipay/alipay.log
|
||||
maxQueryRetry: 5
|
||||
queryDuration: 5
|
||||
maxCancelRetry: 3
|
||||
cancelDuration: 2
|
||||
heartbeatDelay: 5
|
||||
heartbeatDuration: 5
|
||||
storeId:
|
||||
storeName:
|
||||
supportEmail:
|
||||
supportPhone:
|
||||
|
||||
ccpay:
|
||||
paymentUrl: https://api.paymentgateway.com/v1/payment
|
||||
tokenUrl: https://api.paymentgateway.com/v1/token
|
||||
queryUrl: https://api.paymentgateway.com/v1/query
|
||||
refundUrl: https://api.paymentgateway.com/v1/refund
|
||||
apiKey: api-key
|
||||
merchantId: merchant-id
|
||||
currency: USD
|
||||
timeout: 30
|
||||
callbackUrl: https://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/payment/callback
|
||||
|
||||
unionpay:
|
||||
merId: 700000000000001
|
||||
keyPrivateCert: /opt/wfc/conf/cert/unionpay/wfc-union.pfx
|
||||
keyPrivateCertPwd: 123456
|
||||
signCertType: PKCS12
|
||||
encryptCertPath: /opt/wfc/conf/cert/unionpay/wfc-union.cer
|
||||
acpMiddleCert: /opt/wfc/conf/cert/unionpay/wfc-middle.cer
|
||||
acpRootCert: /opt/wfc/conf/cert/unionpay/wfc-root.cer
|
||||
frontUrl: https://gateway.test.95516.com/gateway/api/frontTransReq.do
|
||||
backUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/notify
|
||||
signMethod: 01
|
||||
version: 5.1.0
|
||||
channelType: 07
|
||||
accessType: 0
|
||||
currencyCode: 156
|
||||
bizType: 000201
|
||||
txnType: 01
|
||||
txnSubType: 01
|
||||
payTimeout: 30
|
||||
queryTimeout: 30
|
||||
refundTimeout: 30
|
||||
frontFailUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/fail
|
||||
frontSuccessUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/success
|
||||
frontBackUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/front
|
||||
backBackUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/back
|
||||
frontNotifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/front/notify
|
||||
backNotifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/back/notify
|
||||
refundNotifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/refund/notify
|
||||
queryNotifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/query/notify
|
||||
refundSuccessUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/refund/success
|
||||
refundFailUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/refund/fail
|
||||
querySuccessUrl:
|
||||
appId: 9021000122699258
|
||||
privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7YAcIXV5GJlTWBOoBcrVG1zKxHunznSjYXwTS2DM3YgloxzKye4apfcmBDVnoL93m4QrJTtbiHYvu4yJjJfJsQEY+Wo44IczhDypyu+Il6JpQOwylTs94/+3aaQ1wThsDaGs8edaFGteuw+1pUVl4nxF00fS1VoIR30riqAGFAXrPhcSA6Y9c8HK1htxCelICnPzjpqC4s8ZjrjS7FoyHP2ZAay5fx1VEtah30E4RvycFfV/i2+k3JGFOSeevdCx6Ufu+9Y/RaG4Sh84QuYRQUhAHUswlFDHpRrAnxHzt0zDkOkg3BrCT7vMtBbSOP9BdIhpVTaZm4diQdNbLSl4hAgMBAAECggEAKb1Xc7aQ1KGfTlmj4xSxawlvImOXjAwbWC+6fFlq91BgdjXBhl7b/Y+mvpfBymY3UUIaTAPC/HXGgT2ZoGqImTKsMyGrArgM0qm1M//EfdtV3L96rqxirTqduoSiWL0daWHuWXduoRH8r9K3ZTmY67TLh7FpiKevq9mI7fqs8/qgq5QAN4UPFb3Cq9hDNTU4l6+Bywdg1KkwJ2Jc98SlrIdVl+1eCMAgueLR0aNHTobyPBZ/KfwGRV0OQ3QqjLVgL3zlbzuylYhaZqPgxxd46vgWwkyMiiv7u2OyCetq4LFd+tcNDz0Yqk6rK9/S0oxbN8NM5DLkpwFh/433BoPS3QKBgQD/dsxNr2PYdPLp6pOvw7H2AFMH8CkwTlRg+2f/0fgQF14rJwZgEU6fL5A2JvQeRRC5mCff2m5tDqrS321JNyH/JIKJ+4J8I34GEo/kSCHL3RmyvJGQOQ/EpEyxvP8BV3ob6UO3LR58DOGlJr8eTsr3Y8o9cAMuknCNxvsd2LvybwKBgQC7xKkx4KIPBny6sCOtChOkgIrY3hOCi+ZsHQVESXKzeku0NkH/qrAG+S9pb1XCzXdM2HrzkMeuz6tqi+2TY8nORyY2DZHNW7FqzkAiZ/NO2AgGIlALq1ZfJZke2MxgtBnxSsQ03gfXP9opu/FsLH9a+s6edfHPvKD4kHxlLBfAbwKBgQDYvr6QmuKn4HHJLZGoau0uvw+ziHwp1AubTTLrxgYmAO2Qx0eNcqG2RfChQWOV2xtZnFMYhodyWCNvTsm2eOSLSTrIP3ByStq95DnZganLAgivsXX/W6qZOJ0poCTryoB79enSHKHktjksmjdFS6zBQRVyEvtgJDcC03Rz2lN8WQKBgQCCoJE4otb7bv7s/ccEBeOeaNKvhue5xUwbYKEeXZ6PYAA0sh5+GCf34flq90qJiFl7u4rl0Y4pfk35hLlV9XEasYLSzePmIuktrakOhpTNABus8MgRJjSjYsvAmwCsMf9uTx5qzSBVThWfPSH6qIY9LAj8Un9UjxzJb/Mqi19GvwKBgQC0/KB+3robTqy9KOV4iEKJ4kmnXDRu7ecpMyc8k5HzpolIHcXLZHkBK9pMCXBQ9Kwy6BjRGNnUZOahS+tvnMcjHpwdhu90r7D51GXW/+PeFtphYTscFhHv1yuWbbojzhKf69pZnsVmyllIBqRgtbkS2WNHxWo/peCg47TcLaQNMA==
|
||||
publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhBZoE6p1TKpd/WsAJRTA2D6yUTzqLmZ73scxbPxxKwPIg2ys2Ap21u/lVmqBWO9Wf2Z7wUwr/6BP1PQqVpg0GAqU3yjjZ0LGfBitzMBMbGrlOLqJQ3PKgnUNmnOdLR4FlHCAjKtuyxjHkxBTHg/L4punk4lkFJQD8YvzFrYalS6WYw5j1/oq080NbcjPirPCRlsU7MRraQuUqSTdPwm2iHkroKwCEbGv+RtNJCfOkKNQVtRFFgPGMhU4nQ620gdfzsGJsNFKVJnD5SjeDWniBAbaGaVF4rEfKJPe6+XrcMg3h+9Fz+A2IU1KCCoth2neEZEaU1t0KBGxXIuo4efi/QIDAQAB
|
||||
appCertPath: \u5E94\u7528\u516C\u94A5\u8BC1\u4E66
|
||||
aliPayCertPath: \u652F\u4ED8\u5B9D\u516C\u94A5\u8BC1\u4E66
|
||||
aliPayRootCertPath: \u652F\u4ED8\u5B9D\u6839\u8BC1\u4E66
|
||||
serverUrl: https://openapi-sandbox.dl.alipaydev.com/gateway.do
|
||||
domain: http://localhost:8085
|
||||
testDomain: http://129.204.171.210:8085
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.wfc.payment.alipay.mapper.UAlipayOrderMapper">
|
||||
<resultMap id="UAlipayOrderResultMap" type="org.wfc.payment.alipay.model.UAlipayOrderModel">
|
||||
<id property="id" column="id"/>
|
||||
<result property="userId" column="user_id"/>
|
||||
<result property="outTradeNo" column="out_trade_no"/>
|
||||
<result property="tradeStatus" column="trade_status"/>
|
||||
<result property="totalAmount" column="total_amount"/>
|
||||
<result property="subject" column="subject"/>
|
||||
<result property="body" column="body"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectOrderByOutTradeNo" resultMap="UAlipayOrderResultMap">
|
||||
SELECT * FROM u_alipay_order WHERE out_trade_no = #{outTradeNo}
|
||||
</select>
|
||||
|
||||
<insert id="insertOrder">
|
||||
INSERT INTO u_alipay_order (out_trade_no, trade_status, total_amount, subject, body, create_time, update_time)
|
||||
VALUES (#{outTradeNo}, #{tradeStatus}, #{totalAmount}, #{subject}, #{body}, #{createTime}, #{updateTime})
|
||||
</insert>
|
||||
|
||||
<update id="updateOrder">
|
||||
UPDATE u_alipay_order
|
||||
SET trade_status = #{tradeStatus}, total_amount = #{totalAmount}, subject = #{subject}, body = #{body}, update_time = #{updateTime}
|
||||
WHERE out_trade_no = #{outTradeNo}
|
||||
</update>
|
||||
<select id="selectOrderById" parameterType="long" resultType="org.wfc.payment.alipay.model.UAlipayOrderModel" resultMap="UAlipayOrderResultMap">
|
||||
SELECT * FROM u_alipay_order WHERE id = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.wfc.payment.ccpay.mapper.UCreditCardOrderMapper">
|
||||
|
||||
<insert id="insertOrder" parameterType="org.wfc.payment.ccpay.model.UCreditCardOrder">
|
||||
INSERT INTO u_credit_card_order (transaction_id, user_id, order_id, amount, currency, status, payment_time, card_type, card_holder_name, billing_address, card_last_four, gateway_response)
|
||||
VALUES (#{transactionId}, #{userId}, #{orderId}, #{amount}, #{currency}, #{status}, #{paymentTime}, #{cardType}, #{cardHolderName}, #{billingAddress}, #{cardLastFour}, #{gatewayResponse})
|
||||
</insert>
|
||||
|
||||
<select id="selectOrderById" parameterType="long" resultType="org.wfc.payment.ccpay.model.UCreditCardOrder">
|
||||
SELECT * FROM u_credit_card_order WHERE id = #{id}
|
||||
</select>
|
||||
|
||||
<!-- 其他需要的 SQL 映射 -->
|
||||
</mapper>
|
||||
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.wfc.payment.ccpay.mapper.UCreditCardTokenMapper">
|
||||
|
||||
<insert id="insertToken" parameterType="org.wfc.payment.ccpay.model.UCreditCardToken">
|
||||
INSERT INTO u_credit_card_token (user_id, token, card_last_four, card_type, created_at)
|
||||
VALUES (#{userId}, #{token}, #{cardLastFour}, #{cardType}, #{createdAt})
|
||||
</insert>
|
||||
|
||||
<select id="selectTokenByUserId" parameterType="long" resultType="org.wfc.payment.ccpay.model.UCreditCardToken">
|
||||
SELECT * FROM u_credit_card_token WHERE user_id = #{userId}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -1,34 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.wfc.payment.wxpay.mapper.UWxPayOrderMapper">
|
||||
<resultMap id="UWxPayOrderResultMap" type="org.wfc.payment.wxpay.model.UWxPayOrderModel">
|
||||
<id property="id" column="id"/>
|
||||
<result property="userId" column="user_id"/>
|
||||
<result property="outTradeNo" column="out_trade_no"/>
|
||||
<result property="trancationId" column="trancation_id"/>
|
||||
<result property="tradeStatus" column="trade_status"/>
|
||||
<result property="totalAmount" column="total_amount"/>
|
||||
<result property="subject" column="subject"/>
|
||||
<result property="body" column="body"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectOrderByOutTradeNo" resultMap="UWxPayOrderResultMap">
|
||||
SELECT * FROM u_wxpay_order WHERE out_trade_no = #{outTradeNo}
|
||||
</select>
|
||||
|
||||
<insert id="insertOrder">out_trade_no,
|
||||
INSERT INTO u_wxpay_order (out_trade_no, trancation_id, trade_status, total_amount, subject, body, create_time, update_time)
|
||||
VALUES (#{outTradeNo}, #{trancationId}, #{tradeStatus}, #{totalAmount}, #{subject}, #{body}, #{createTime}, #{updateTime})
|
||||
</insert>
|
||||
|
||||
<update id="updateOrder">
|
||||
UPDATE u_wxpay_order
|
||||
SET trade_status = #{tradeStatus}, total_amount = #{totalAmount}, subject = #{subject}, body = #{body}, update_time = #{updateTime}
|
||||
WHERE out_trade_no = #{outTradeNo}
|
||||
</update>
|
||||
<select id="selectOrderById" parameterType="long" resultType="org.wfc.payment.wxpay.model.UWxPayOrderModel" resultMap="UWxPayOrderResultMap">
|
||||
SELECT * FROM u_wxpay_order WHERE id = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user