From 8a2a463d46b3dce73015462c9f6a2a258dd25f5b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 二月 2022 11:40:11 +0800
Subject: [PATCH] 优化diamante
---
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
index 3c462ca..c5cbafb 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
@@ -23,8 +23,9 @@
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -32,10 +33,7 @@
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;
+import java.util.*;
@Service("toPayTempCarFeeSMOImpl")
public class ToPayTempCarFeeSMOImpl extends AppAbstractComponentSMO implements IToPayTempCarFeeSMO {
@@ -69,6 +67,7 @@
Assert.jsonObjectHaveKey(paramIn, "openId", "璇锋眰鎶ユ枃涓湭鍖呭惈openId鑺傜偣");
Assert.jsonObjectHaveKey(paramIn, "paId", "璇锋眰鎶ユ枃涓湭鍖呭惈paId鑺傜偣");
Assert.jsonObjectHaveKey(paramIn, "inoutId", "璇锋眰鎶ユ枃涓湭鍖呭惈inoutId鑺傜偣");
+ Assert.jsonObjectHaveKey(paramIn, "couponList", "璇锋眰鎶ユ枃涓湭鍖呭惈couponList鑺傜偣");
}
@@ -86,11 +85,16 @@
smallWeChatDto.setMchId(wechatAuthProperties.getMchId());
smallWeChatDto.setPayPassword(wechatAuthProperties.getKey());
}
-
-
+ JSONArray couponList = paramIn.getJSONArray("couponList");
+ List<String> couponIds = new ArrayList<String>();
+ if (couponList != null && couponList.size() > 0) {
+ for (int couponIndex = 0; couponIndex < couponList.size(); couponIndex++) {
+ couponIds.add(couponList.getJSONObject(couponIndex).getString("couponId"));
+ }
+ }
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = "tempCarFee.getTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum");
+ String url = "tempCarFee.queryTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum")+"&couponIds="+StringUtils.join(couponIds,",");
responseEntity = super.callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
--
Gitblit v1.8.0