From b160f874fda18ef0adad8e9145ad42d534d47818 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 16:58:09 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/payment/impl/GoodsToPaySMOImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/payment/impl/GoodsToPaySMOImpl.java b/service-front/src/main/java/com/java110/front/smo/payment/impl/GoodsToPaySMOImpl.java
old mode 100644
new mode 100755
index ae100d9..431b0be
--- a/service-front/src/main/java/com/java110/front/smo/payment/impl/GoodsToPaySMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/impl/GoodsToPaySMOImpl.java
@@ -10,9 +10,15 @@
import com.java110.front.properties.WechatAuthProperties;
import com.java110.front.smo.AppAbstractComponentSMO;
import com.java110.front.smo.payment.IGoodsToPaySMO;
+import com.java110.front.smo.payment.adapt.IPayAdapt;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +83,10 @@
return responseEntity;
}
JSONObject orderInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ if (orderInfo.getInteger("code") != ResultVo.CODE_OK) {
+ throw new IllegalArgumentException("涓嬪崟澶辫触锛�" + orderInfo.getString("msg"));
+ }
+ orderInfo = orderInfo.getJSONObject("data");
String orderId = orderInfo.getString("orderId");
double money = Double.parseDouble(orderInfo.getString("payPrice"));
String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
@@ -88,7 +98,7 @@
appType = OwnerAppUserDto.APP_TYPE_APP;
}
Map tmpParamIn = new HashMap();
- tmpParamIn.put("userId", pd.getUserId());
+ tmpParamIn.put("userId", paramIn.getString("personId"));
tmpParamIn.put("appType", appType);
responseEntity = super.getOwnerAppUser(pd, restTemplate, tmpParamIn);
logger.debug("鏌ヨ鐢ㄦ埛淇℃伅杩斿洖鎶ユ枃锛�" + responseEntity);
@@ -105,8 +115,13 @@
JSONObject realUserInfo = userResult.getJSONArray("data").getJSONObject(0);
String openId = realUserInfo.getString("openId");
-
- Map result = super.java110Payment(outRestTemplate, paramIn.getString("feeName"), paramIn.getString("tradeType"), orderId, money, openId, smallWeChatDto);
+ String payAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_ADAPT);
+ payAdapt = StringUtil.isEmpty(payAdapt) ? DEFAULT_PAY_ADAPT : payAdapt;
+ //鏀粯閫傞厤鍣�
+ IPayAdapt tPayAdapt = ApplicationContextFactory.getBean(payAdapt, IPayAdapt.class);
+ Map result = tPayAdapt.java110Payment(outRestTemplate, "鍟嗗搧璐拱",
+ paramIn.getString("tradeType"), orderId, money, openId,
+ smallWeChatDto, wechatAuthProperties.getGoodsNotifyUrl());
responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);
return responseEntity;
--
Gitblit v1.8.0