From b8d1f25f4fdb9d8bc109c103e84307d6925ce218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 21 十二月 2022 17:16:04 +0800
Subject: [PATCH] 优化代码
---
service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 1e14b33..34e29d4 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,10 +4,14 @@
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;
import com.java110.utils.constant.WechatConstant;
@@ -17,16 +21,19 @@
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
/**
* 鎵爜浠�
*/
@Java110Cmd(serviceCode = "payment.qrCodePayment")
-public class QrCodePaymentCmd extends AbstractServiceCmdListener {
+public class QrCodePaymentCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(QrCodePaymentCmd.class);
+
+ @Autowired
+ private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
private IQrCodePaymentSMO qrCodePaymentSMOImpl;
@@ -47,20 +54,30 @@
String payQrAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_QR_ADAPT);
- if(StringUtil.isEmpty(payQrAdapt)) {
+ if (StringUtil.isEmpty(payQrAdapt)) {
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{
+ } else {
qrCodePaymentSMOImpl = ApplicationContextFactory.getBean(payQrAdapt, IQrCodePaymentSMO.class);
}
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setCommunityId(reqJson.getString("communityId"));
+ List<CommunityDto> communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto);
+
+ Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦�");
+
+ String feeName = communityDtos.get(0).getName() + "-" + reqJson.getString("payerObjName") + "-" + reqJson.getString("feeName");
+
ResultVo resultVo = null;
try {
- resultVo = qrCodePaymentSMOImpl.pay(reqJson.getString("communityId"), orderId, receivedAmount, authCode, "");
+ resultVo = qrCodePaymentSMOImpl.pay(reqJson.getString("communityId"), orderId, receivedAmount, authCode, feeName);
} catch (Exception e) {
logger.error("寮傚父浜�", e);
cmdDataFlowContext.setResponseEntity(ResultVo.error(e.getLocalizedMessage()));
--
Gitblit v1.8.0