From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
service-acct/src/main/java/com/java110/acct/cmd/payment/CheckPayFinishCmd.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/cmd/payment/CheckPayFinishCmd.java b/service-acct/src/main/java/com/java110/acct/cmd/payment/CheckPayFinishCmd.java
index ee1d407..1678583 100644
--- a/service-acct/src/main/java/com/java110/acct/cmd/payment/CheckPayFinishCmd.java
+++ b/service-acct/src/main/java/com/java110/acct/cmd/payment/CheckPayFinishCmd.java
@@ -4,24 +4,23 @@
import com.java110.acct.smo.IQrCodePaymentSMO;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.CallApiServiceFactory;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.WechatConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
/**
* 鎵爜浠�
*/
@Java110Cmd(serviceCode = "payment.checkPayFinish")
-public class CheckPayFinishCmd extends AbstractServiceCmdListener {
+public class CheckPayFinishCmd extends Cmd {
private IQrCodePaymentSMO qrCodePaymentSMOImpl;
@@ -33,20 +32,24 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- String orderId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId);
+ String orderId = reqJson.getString("orderId");
double receivedAmount = Double.parseDouble(reqJson.getString("receivedAmount"));
String authCode = reqJson.getString("authCode");
if (StringUtil.isEmpty(authCode) || authCode.length() < 2) {
throw new IllegalArgumentException("鎺堟潈鐮侀敊璇�");
}
+ String payQrAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_QR_ADAPT);
- int pre = Integer.parseInt(authCode.substring(0, 2));
- if (pre > 24 && pre < 31) { // 鏀粯瀹�
- qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeAliPaymentAdapt", IQrCodePaymentSMO.class);
+ if (StringUtil.isEmpty(payQrAdapt)) {
+ int pre = Integer.parseInt(authCode.substring(0, 2));
+ if (pre > 24 && pre < 31) { // 鏀粯瀹�
+ qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeAliPaymentAdapt", IQrCodePaymentSMO.class);
+ } else {
+ qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeWechatPaymentAdapt", IQrCodePaymentSMO.class);
+ }
} else {
- qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeWechatPaymentAdapt", IQrCodePaymentSMO.class);
+ qrCodePaymentSMOImpl = ApplicationContextFactory.getBean(payQrAdapt, IQrCodePaymentSMO.class);
}
-
ResultVo resultVo = null;
try {
resultVo = qrCodePaymentSMOImpl.checkPayFinish(reqJson.getString("communityId"), orderId);
@@ -60,8 +63,8 @@
}
String appId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.APP_ID);
String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
- String paramOut = CallApiServiceFactory.postForApi(appId, reqJson.toJSONString(), "fee.payFee", String.class, userId);
- cmdDataFlowContext.setResponseEntity(new ResponseEntity(paramOut, HttpStatus.OK));
+ JSONObject paramOut = CallApiServiceFactory.postForApi(appId, reqJson, "fee.payFee", JSONObject.class, userId);
+ cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(paramOut));
}
}
--
Gitblit v1.8.0