From 71c44764e2a5fbf2e541616def84610a41423ae1 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 16 八月 2024 14:42:39 +0800
Subject: [PATCH] 配置数据源增加8.130.130.233
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java
index 0e8d641..356ac1f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
+import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.ResultCodeMsg;
@@ -236,8 +237,26 @@
virtualCard.setClientId(clientId);
virtualCard.setOrderNumber(orderNumber);
virtualCard.setRechargeAmount(rechargeAmount);
- BaseResponse result = virtualCardSv.insertVCRecharge(virtualCard);
- if(!result.getCode().equals("0001")) {
+
+ // -1锛氳櫄鎷熷崱涓嶅瓨鍦紝0锛氭坊鍔犲厖鍊艰褰曞け璐�
+ Long rechargeId = virtualCardSv.insertVCRecharge(virtualCard);
+ if(rechargeId.equals(-1)) {
+ return BaseResponseUtils.buildFail(WechatResultCode.NO_ACCOUNT.getMessage());
+ }
+ if(rechargeId.equals(0)) {
+ return BaseResponseUtils.buildFail(WechatResultCode.RECHARGE_FAIL.getMessage());
+ }
+
+ // 鐢熸垚鍏呭�兼搷浣滆褰曪紝鍏呭�兼搷浣滀汉涓哄啘鎴�
+ SeVcOperate seVcOperate = new SeVcOperate();
+ seVcOperate.setVcId(virtualId);
+ seVcOperate.setClientId(clientId);
+ seVcOperate.setOperateType(LastOperateENUM.RECHARGE.getCode());
+ seVcOperate.setRechargeId(rechargeId);
+ seVcOperate.setOperator(clientId);
+ seVcOperate.setOperateTime(new Date());
+ Long vcOperateId = virtualCardSv.insertVcOperate(seVcOperate);
+ if(vcOperateId == null) {
return BaseResponseUtils.buildErrorMsg(WechatResultCode.RECHARGE_ADD_FAIL.getMessage());
}
@@ -246,6 +265,7 @@
job_body.put("mchid", mchid);
job_body.put("description", description);
job_body.put("out_trade_no", orderNumber);
+ job_body.put("attach", DataSourceContext.get());
job_body.put("notify_url", notifyUrl);
//璁㈠崟閲戦
@@ -420,6 +440,8 @@
JSONObject job_resource = JSONObject.parseObject(resource);
// 瑙ｅ瘑鍚庡彇鍑猴細鍟嗘埛璁㈠崟鍙枫�佸井淇℃敮浠樿鍗曞彿銆佷氦鏄撶姸鎬併�佹敮浠樺畬鎴愭椂闂�
+ String attach = job_resource.getString("attach");
+ DataSourceContext.set(attach);
String out_trade_no = job_resource.getString("out_trade_no");
String transaction_id = job_resource.getString("transaction_id");
String trade_state = job_resource.getString("trade_state");
--
Gitblit v1.8.0