From d526cf637048d71f046667f26e76436e9d489861 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期日, 23 四月 2023 22:45:11 +0800
Subject: [PATCH] 优化代码
---
springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
index c40991f..474d49f 100644
--- a/springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
@@ -10,8 +10,11 @@
import com.java110.core.context.PageData;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
+import com.java110.dto.owner.OwnerCarOpenUserDto;
+import com.java110.dto.parking.ParkingAreaDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
+import com.java110.intf.community.IParkingAreaV1InnerServiceSMO;
import com.java110.intf.user.IOwnerCarOpenUserV1InnerServiceSMO;
import com.java110.po.ownerCarOpenUser.OwnerCarOpenUserPo;
import com.java110.utils.cache.MappingCache;
@@ -51,6 +54,9 @@
@Autowired
private IOwnerCarOpenUserV1InnerServiceSMO ownerCarOpenUserV1InnerServiceSMOImpl;
+ @Autowired
+ private IParkingAreaV1InnerServiceSMO parkingAreaV1InnerServiceSMOImpl;
+
@Override
public ResponseEntity<String> toPay(IPageData pd) {
return super.businessProcess(pd);
@@ -74,6 +80,16 @@
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) { //浠庨厤缃枃浠朵腑鑾峰彇 灏忕▼搴忛厤缃俊鎭�
@@ -87,12 +103,15 @@
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"));
+ couponIds.add(couponList.getString(couponIndex));
}
}
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = "tempCarFee.queryTempCarFeeOrder?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) {
@@ -111,6 +130,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();
@@ -146,7 +166,7 @@
OwnerCarOpenUserPo ownerCarOpenUserPo = new OwnerCarOpenUserPo();
ownerCarOpenUserPo.setCarNum(paramIn.getString("carNum"));
ownerCarOpenUserPo.setNickname("鏈幏鍙�");
- ownerCarOpenUserPo.setHeadimgurl("涓鸿幏鍙�");
+ ownerCarOpenUserPo.setHeadimgurl("鏈幏鍙�");
ownerCarOpenUserPo.setOpenId(openId);
ownerCarOpenUserPo.setOpenType(OwnerCarOpenUserDto.OPEN_TYPE_WECHAT);
ownerCarOpenUserPo.setOpenUserId(GenerateCodeFactory.getGeneratorId("10"));
--
Gitblit v1.8.0