From e52ddfe8caf7d0027950033a5aff2a1fd3482e9d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 01 六月 2022 17:50:25 +0800
Subject: [PATCH] 优化装修 跟踪记录 回显
---
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPaySMOImpl.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPaySMOImpl.java b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPaySMOImpl.java
index 7338d79..0dcd98c 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPaySMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPaySMOImpl.java
@@ -2,26 +2,26 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.core.context.IPageData;
-import com.java110.core.context.PageData;
-import com.java110.dto.app.AppDto;
-import com.java110.dto.owner.OwnerAppUserDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.api.properties.WechatAuthProperties;
import com.java110.api.smo.AppAbstractComponentSMO;
import com.java110.api.smo.payment.IToPaySMO;
import com.java110.api.smo.payment.adapt.IPayAdapt;
+import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.app.AppDto;
+import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.CommonConstant;
-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.DateUtil;
import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -69,7 +69,7 @@
@Override
protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) throws Exception {
- ResponseEntity responseEntity = null;
+ ResponseEntity<String> responseEntity = null;
SmallWeChatDto smallWeChatDto = getSmallWechat(pd, paramIn);
@@ -91,21 +91,26 @@
}
JSONObject orderInfo = JSONObject.parseObject(responseEntity.getBody().toString());
String orderId = orderInfo.getString("oId");
+ String feeName = orderInfo.getString("feeName");
double money = Double.parseDouble(orderInfo.getString("receivedAmount"));
//闇�瑕佸垽鏂噾棰濇槸鍚� == 0 绛変簬0 鐩存帴鎺夌即璐归�氱煡鎺ュ彛
if (money <= 0) {
JSONObject paramOut = new JSONObject();
paramOut.put("oId", orderId);
String urlOut = "fee.payFeeConfirm";
- responseEntity = this.callCenterService(getHeaders("-1",pd.getAppId()), paramOut.toJSONString(), urlOut, HttpMethod.POST);
+ responseEntity = this.callCenterService(getHeaders("-1", pd.getAppId()), paramOut.toJSONString(), urlOut, HttpMethod.POST);
JSONObject param = new JSONObject();
if (responseEntity.getStatusCode() != HttpStatus.OK) {
- param.put("code","101");
- param.put("msg","鎵ｈ垂涓�0鍥炶皟澶辫触");
+ param.put("code", "101");
+ param.put("msg", "鎵ｈ垂涓�0鍥炶皟澶辫触");
return new ResponseEntity(JSONObject.toJSONString(param), HttpStatus.OK);
}
- param.put("code","100");
- param.put("msg","鎵ｈ垂涓�0鍥炶皟鎴愬姛");
+ JSONObject result = JSONObject.parseObject(responseEntity.getBody());
+ if (ResultVo.CODE_OK != result.getInteger("code")) {
+ return responseEntity;
+ }
+ param.put("code", "100");
+ param.put("msg", "鎵ｈ垂涓�0鍥炶皟鎴愬姛");
return new ResponseEntity(JSONObject.toJSONString(param), HttpStatus.OK);
}
String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
@@ -138,13 +143,13 @@
payAdapt = StringUtil.isEmpty(payAdapt) ? DEFAULT_PAY_ADAPT : payAdapt;
//鏀粯閫傞厤鍣�
IPayAdapt tPayAdapt = ApplicationContextFactory.getBean(payAdapt, IPayAdapt.class);
- Map result = tPayAdapt.java110Payment(outRestTemplate, paramIn.getString("feeName"), paramIn.getString("tradeType"), orderId, money, openId, smallWeChatDto);
+ Map result = tPayAdapt.java110Payment(outRestTemplate, feeName, paramIn.getString("tradeType"), orderId, money, openId, smallWeChatDto);
responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);
return responseEntity;
}
- private Map<String, String> getHeaders(String userId,String appId) {
+ private Map<String, String> getHeaders(String userId, String appId) {
Map<String, String> headers = new HashMap<>();
headers.put(CommonConstant.HTTP_APP_ID.toLowerCase(), appId);
headers.put(CommonConstant.HTTP_USER_ID.toLowerCase(), userId);
@@ -153,6 +158,7 @@
headers.put(CommonConstant.HTTP_SIGN.toLowerCase(), "");
return headers;
}
+
private SmallWeChatDto getSmallWechat(IPageData pd, JSONObject paramIn) {
ResponseEntity responseEntity = null;
--
Gitblit v1.8.0