From 4ee86eb0f4984bf3ede3196ad8c5fe95e8c5a504 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 19:05:02 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPaySMOImpl.java | 62 +++++++++++++++++++++++-------
1 files changed, 47 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 f1061f9..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,24 +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.ServiceConstant;
+import com.java110.utils.constant.CommonConstant;
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 org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -27,14 +29,14 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.UUID;
@Service("toPaySMOImpl")
public class ToPaySMOImpl extends AppAbstractComponentSMO implements IToPaySMO {
private static final Logger logger = LoggerFactory.getLogger(AppAbstractComponentSMO.class);
-
-
@Autowired
@@ -67,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);
@@ -81,7 +83,7 @@
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = ServiceConstant.SERVICE_API_URL + "/api/fee.payFeePre";
+ String url = "fee.payFeePre";
responseEntity = super.callCenterService(restTemplate, pd, paramIn.toJSONString(), url, HttpMethod.POST);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -89,7 +91,28 @@
}
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);
+ JSONObject param = new JSONObject();
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ param.put("code", "101");
+ param.put("msg", "鎵ｈ垂涓�0鍥炶皟澶辫触");
+ return new ResponseEntity(JSONObject.toJSONString(param), HttpStatus.OK);
+ }
+ 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;
if (AppDto.WECHAT_OWNER_APP_ID.equals(pd.getAppId())) {
appType = OwnerAppUserDto.APP_TYPE_WECHAT;
@@ -98,6 +121,7 @@
} else {
appType = OwnerAppUserDto.APP_TYPE_APP;
}
+
Map tmpParamIn = new HashMap();
tmpParamIn.put("userId", pd.getUserId());
tmpParamIn.put("appType", appType);
@@ -106,7 +130,6 @@
if (responseEntity.getStatusCode() != HttpStatus.OK) {
throw new IllegalArgumentException("鏈煡璇㈢敤鎴蜂俊鎭紓甯�" + tmpParamIn);
}
-
JSONObject userResult = JSONObject.parseObject(responseEntity.getBody().toString());
int total = userResult.getIntValue("total");
if (total < 1) {
@@ -120,12 +143,21 @@
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) {
+ Map<String, String> headers = new HashMap<>();
+ headers.put(CommonConstant.HTTP_APP_ID.toLowerCase(), appId);
+ headers.put(CommonConstant.HTTP_USER_ID.toLowerCase(), userId);
+ headers.put(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), UUID.randomUUID().toString());
+ headers.put(CommonConstant.HTTP_REQ_TIME.toLowerCase(), DateUtil.getDefaultFormateTimeString(new Date()));
+ headers.put(CommonConstant.HTTP_SIGN.toLowerCase(), "");
+ return headers;
+ }
private SmallWeChatDto getSmallWechat(IPageData pd, JSONObject paramIn) {
@@ -135,8 +167,8 @@
"", "", "", "",
pd.getAppId());
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?appId="
- + paramIn.getString("appId") + "&page=1&row=1&communityId="+paramIn.getString("communityId"), HttpMethod.GET);
+ "smallWeChat.listSmallWeChats?appId="
+ + paramIn.getString("appId") + "&page=1&row=1&communityId=" + paramIn.getString("communityId"), HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return null;
--
Gitblit v1.8.0