From c2614ad5c7d1e27fae68e52cd058af363464cdb4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 21 五月 2022 23:16:38 +0800
Subject: [PATCH] 优化代码
---
service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeAliPaymentAdapt.java | 6 +++++-
service-acct/src/main/java/com/java110/acct/cmd/payment/QrCodePaymentCmd.java | 26 ++++++++++++++++++++------
service-acct/src/main/java/com/java110/acct/cmd/payment/CheckPayFinishCmd.java | 7 +++----
service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java | 13 +++++++++----
4 files changed, 37 insertions(+), 15 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 09e61a3..3e683a2 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
@@ -7,7 +7,6 @@
import com.java110.core.event.cmd.AbstractServiceCmdListener;
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;
@@ -35,7 +34,7 @@
@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) {
@@ -66,8 +65,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));
}
}
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..22dcca4 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
@@ -8,6 +8,9 @@
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.intf.community.ICommunityV1InnerServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.WechatConstant;
@@ -17,9 +20,9 @@
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;
/**
* 鎵爜浠�
@@ -27,6 +30,9 @@
@Java110Cmd(serviceCode = "payment.qrCodePayment")
public class QrCodePaymentCmd extends AbstractServiceCmdListener {
private static Logger logger = LoggerFactory.getLogger(QrCodePaymentCmd.class);
+
+ @Autowired
+ private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
private IQrCodePaymentSMO qrCodePaymentSMOImpl;
@@ -47,20 +53,28 @@
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);
} else {
qrCodePaymentSMOImpl = ApplicationContextFactory.getBean("qrCodeWechatPaymentAdapt", IQrCodePaymentSMO.class);
}
- }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()));
diff --git a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeAliPaymentAdapt.java b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeAliPaymentAdapt.java
index f6cf41e..cacab44 100644
--- a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeAliPaymentAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeAliPaymentAdapt.java
@@ -99,7 +99,11 @@
@Override
public ResultVo checkPayFinish(String communityId, String orderNum) {
- AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", "app_id", "your private_key", "json", "GBK", "alipay_public_key", "RSA2");
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+ CommunitySettingFactory.getValue(communityId, "APP_ID"),
+ CommunitySettingFactory.getRemark(communityId, "APP_PRIVATE_KEY"),
+ "json", "UTF-8",
+ CommunitySettingFactory.getRemark(communityId, "ALIPAY_PUBLIC_KEY"), "RSA2");
AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
request.setBizContent("{" +
" \"out_trade_no\":\"" + orderNum + "\"," +
diff --git a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java
index e222d6e..9c69289 100644
--- a/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/smo/impl/QrCodeWechatPaymentAdapt.java
@@ -78,7 +78,7 @@
paramMap.put("appid", shopSmallWeChatDto.getAppId());
paramMap.put("mch_id", shopSmallWeChatDto.getMchId());
paramMap.put("nonce_str", PayUtil.makeUUID(32));
- paramMap.put("body", systemName + feeName);
+ paramMap.put("body", feeName);
paramMap.put("out_trade_no", orderNum);
paramMap.put("total_fee", PayUtil.moneyToIntegerStr(payAmount));
paramMap.put("spbill_create_ip", PayUtil.getLocalIp());
@@ -111,7 +111,7 @@
if ("SUCCESS".equals(resMap.get("return_code")) && "SUCCESS".equals(resMap.get("result_code"))) {
return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
} else {
- return new ResultVo(ResultVo.CODE_ERROR, resMap.get("msg"));
+ return new ResultVo(ResultVo.CODE_ERROR, resMap.get("err_code_des"));
}
}
@@ -135,10 +135,15 @@
SortedMap<String, String> paramMap = new TreeMap<String, String>();
paramMap.put("appid", shopSmallWeChatDto.getAppId());
- paramMap.put("mch_id", shopSmallWeChatDto.getMchId());
+ paramMap.put("sub_mch_id", shopSmallWeChatDto.getMchId());
paramMap.put("nonce_str", PayUtil.makeUUID(32));
paramMap.put("out_trade_no", orderNum);
- paramMap.put("sign", PayUtil.createSign(paramMap, smallWeChatDto.getPayPassword()));
+ String paySwitch = MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_PAY_SWITCH);
+ if (WECHAT_SERVICE_PAY_SWITCH_ON.equals(paySwitch)) {
+ paramMap.put("appid", MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_APP_ID)); //鏈嶅姟鍟哸ppid锛屾槸鏈嶅姟鍟嗘敞鍐屾椂鍏紬鍙风殑id
+ paramMap.put("mch_id", MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_MCH_ID)); //鏈嶅姟鍟嗗晢鎴�
+ }
+ paramMap.put("sign", PayUtil.createSign(paramMap, shopSmallWeChatDto.getPayPassword()));
//杞崲涓簒ml
String xmlData = PayUtil.mapToXml(paramMap);
--
Gitblit v1.8.0