From 4816308ace36e9f20caf4255c97e96f89f3a8a32 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 20 六月 2023 16:07:33 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 16351ea..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;
@@ -25,7 +26,7 @@
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;
@@ -58,6 +59,9 @@
return super.businessProcess(pd);
}
+ @Autowired
+ private IParkingAreaV1InnerServiceSMO parkingAreaV1InnerServiceSMOImpl;
+
@Override
protected void validate(IPageData pd, JSONObject paramIn) {
@@ -76,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) { //浠庨厤缃枃浠朵腑鑾峰彇 灏忕▼搴忛厤缃俊鎭�
@@ -94,7 +105,10 @@
}
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = "tempCarFee.getTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum")+"&couponIds="+StringUtils.join(couponIds,",");
+ 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) {
@@ -113,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