From a5e6a69003f869d667a462d3d0273437080de834 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 27 五月 2021 15:03:39 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/payment/impl/GoodsToPaySMOImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 0734361..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;
@@ -49,7 +55,7 @@
protected void validate(IPageData pd, JSONObject paramIn) {
Assert.jsonObjectHaveKey(paramIn, "addressId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍦板潃");
- Assert.jsonObjectHaveKey(paramIn, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛ID");
+ Assert.jsonObjectHaveKey(paramIn, "personId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛ID");
Assert.hasKey(paramIn, "goodsList", "鏈寘鍚晢鍝佷俊鎭�");
@@ -70,15 +76,19 @@
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = ServiceConstant.SERVICE_API_URL + "/api/fee.payFeePre";
+ String url = ServiceConstant.SERVICE_API_URL + "/api/storeOrder/saveStoreOrder";
responseEntity = super.callCenterService(restTemplate, pd, paramIn.toJSONString(), url, HttpMethod.POST);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
JSONObject orderInfo = JSONObject.parseObject(responseEntity.getBody().toString());
- String orderId = orderInfo.getString("oId");
- double money = Double.parseDouble(orderInfo.getString("receivableAmount"));
+ 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;
if (AppDto.WECHAT_OWNER_APP_ID.equals(pd.getAppId())) {
appType = OwnerAppUserDto.APP_TYPE_WECHAT;
@@ -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