From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java b/service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java
index 22dcca4..fbd66ba 100644
--- a/service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java
+++ b/service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java
@@ -4,12 +4,13 @@
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.core.log.LoggerFactory;
import com.java110.dto.community.CommunityDto;
+import com.java110.dto.fee.FeeDetailDto;
import com.java110.intf.community.ICommunityV1InnerServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.CommonConstant;
@@ -28,7 +29,7 @@
* 鎵爜浠�
*/
@Java110Cmd(serviceCode = "payment.qrCodePayment")
-public class QrCodePaymentCmd extends AbstractServiceCmdListener {
+public class QrCodePaymentCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(QrCodePaymentCmd.class);
@Autowired
@@ -40,6 +41,8 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "authCode", "鏈寘鍚巿鏉冪爜");
+ Assert.hasKeyAndValue(reqJson, "receivedAmount", "鏈寘鍚敮浠橀噾棰�");
+ Assert.hasKeyAndValue(reqJson, "subServiceCode", "鏈寘鍚敮浠樻帴鍙�");
}
@Override
@@ -57,8 +60,10 @@
int pre = Integer.parseInt(authCode.substring(0, 2));
if (pre > 24 && pre < 31) { // 鏀粯瀹�
qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeAliPaymentAdapt", IQrCodePaymentSMO.class);
+ reqJson.put("primeRate", FeeDetailDto.PRIME_REATE_WECHAT_QRCODE);
} else {
qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeWechatPaymentAdapt", IQrCodePaymentSMO.class);
+ reqJson.put("primeRate", FeeDetailDto.PRIME_REATE_ALI_QRCODE);
}
} else {
qrCodePaymentSMOImpl = ApplicationContextFactory.getBean(payQrAdapt, IQrCodePaymentSMO.class);
@@ -70,7 +75,18 @@
Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦�");
- String feeName = communityDtos.get(0).getName() + "-" + reqJson.getString("payerObjName") + "-" + reqJson.getString("feeName");
+ String feeName = communityDtos.get(0).getName();
+ if (!StringUtil.isEmpty(reqJson.getString("payerObjName"))) {
+ feeName += ("-" + reqJson.getString("payerObjName"));
+ }
+
+ if (!StringUtil.isEmpty(reqJson.getString("feeName"))) {
+ feeName += ("-" + reqJson.getString("feeName"));
+ }
+
+ if (feeName.length() > 120) {
+ feeName = feeName.substring(0, 120);
+ }
ResultVo resultVo = null;
try {
@@ -88,7 +104,8 @@
}
String appId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.APP_ID);
String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
- JSONObject paramOut = CallApiServiceFactory.postForApi(appId, reqJson, "fee.payFee", JSONObject.class, userId);
+ //JSONObject paramOut = CallApiServiceFactory.postForApi(appId, reqJson, "fee.payFee", JSONObject.class, userId);
+ JSONObject paramOut = CallApiServiceFactory.postForApi(appId, reqJson, reqJson.getString("subServiceCode"), JSONObject.class, userId);
cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(paramOut));
}
--
Gitblit v1.8.0