From 45149c4de50d945a27cbc7324ec0699f5b15df14 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 27 二月 2024 13:57:47 +0800
Subject: [PATCH] 取消空格问题
---
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 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..55e5244 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
@@ -9,12 +9,13 @@
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.fee.FeeDto;
-import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.dto.owner.OwnerCarOpenUserDto;
+import com.java110.dto.parking.ParkingAreaDto;
+import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.dto.fee.TempCarPayOrderDto;
+import com.java110.intf.community.IParkingAreaV1InnerServiceSMO;
import com.java110.intf.user.IOwnerCarOpenUserV1InnerServiceSMO;
-import com.java110.po.ownerCarOpenUser.OwnerCarOpenUserPo;
-import com.java110.utils.cache.CommonCache;
+import com.java110.po.owner.OwnerCarOpenUserPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.WechatConstant;
@@ -23,8 +24,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 +34,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 {
@@ -60,6 +59,9 @@
return super.businessProcess(pd);
}
+ @Autowired
+ private IParkingAreaV1InnerServiceSMO parkingAreaV1InnerServiceSMOImpl;
+
@Override
protected void validate(IPageData pd, JSONObject paramIn) {
@@ -69,6 +71,7 @@
Assert.jsonObjectHaveKey(paramIn, "openId", "璇锋眰鎶ユ枃涓湭鍖呭惈openId鑺傜偣");
Assert.jsonObjectHaveKey(paramIn, "paId", "璇锋眰鎶ユ枃涓湭鍖呭惈paId鑺傜偣");
Assert.jsonObjectHaveKey(paramIn, "inoutId", "璇锋眰鎶ユ枃涓湭鍖呭惈inoutId鑺傜偣");
+ Assert.jsonObjectHaveKey(paramIn, "couponList", "璇锋眰鎶ユ枃涓湭鍖呭惈couponList鑺傜偣");
}
@@ -77,6 +80,13 @@
ResponseEntity responseEntity = null;
+ //鏍规嵁paId 鏌ヨcommunityId
+ ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+ parkingAreaDto.setPaId(paramIn.getString("paId"));
+ List<ParkingAreaDto> parkingAreaDtos = parkingAreaV1InnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+
+ Assert.listOnlyOne(parkingAreaDtos,"鍋滆溅鍦轰笉瀛樺湪");
+ paramIn.put("communityId",parkingAreaDtos.get(0).getCommunityId());
SmallWeChatDto smallWeChatDto = getSmallWechat(pd, paramIn);
if (smallWeChatDto == null) { //浠庨厤缃枃浠朵腑鑾峰彇 灏忕▼搴忛厤缃俊鎭�
@@ -86,11 +96,19 @@
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")
+ + "&machineId=" + paramIn.getString("machineId")
+ +"&couponIds="+StringUtils.join(couponIds,",");
responseEntity = super.callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -109,6 +127,7 @@
if (money <= 0) {
JSONObject paramOut = new JSONObject();
paramOut.put("oId", orderId);
+ paramOut.put("payType", TempCarPayOrderDto.PAY_TYPE_WECHAT);
String urlOut = "tempCarFee.notifyTempCarFeeOrder";
responseEntity = this.callCenterService(getHeaders("-1", pd.getAppId()), paramOut.toJSONString(), urlOut, HttpMethod.POST);
JSONObject param = new JSONObject();
--
Gitblit v1.8.0