From 8749db96edc44e76a9b2ecaf0332e8c0f34fbb5b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 14:58:59 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeCreateOrderV1InnerServiceSMOImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeCreateOrderV1InnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeCreateOrderV1InnerServiceSMOImpl.java
index 7996eb5..abe0eaf 100644
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeCreateOrderV1InnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeCreateOrderV1InnerServiceSMOImpl.java
@@ -1,27 +1,23 @@
package com.java110.fee.smo.impl;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.couponUser.CouponUserDto;
-import com.java110.dto.parkingCouponCar.ParkingCouponCarDto;
-import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
+import com.java110.dto.parking.ParkingAreaDto;
+import com.java110.dto.parking.ParkingCouponCarDto;
+import com.java110.dto.fee.TempCarPayOrderDto;
import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules;
import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
import com.java110.intf.acct.IParkingCouponCarOrderV1InnerServiceSMO;
import com.java110.intf.acct.IParkingCouponCarV1InnerServiceSMO;
+import com.java110.intf.community.IParkingAreaV1InnerServiceSMO;
import com.java110.intf.fee.ITempCarFeeCreateOrderV1InnerServiceSMO;
-import com.java110.po.couponUser.CouponUserPo;
-import com.java110.po.couponUserDetail.CouponUserDetailPo;
-import com.java110.po.parkingCouponCar.ParkingCouponCarPo;
-import com.java110.po.parkingCouponCarOrder.ParkingCouponCarOrderPo;
-import com.java110.po.tempCarFeeConfig.TempCarFeeConfigPo;
+import com.java110.po.parking.ParkingCouponCarPo;
+import com.java110.po.parking.ParkingCouponCarOrderPo;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -30,7 +26,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
-import java.util.Arrays;
import java.util.List;
@RestController
@@ -49,6 +44,9 @@
@Autowired
private IParkingCouponCarOrderV1InnerServiceSMO parkingCouponCarOrderV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingAreaV1InnerServiceSMO parkingAreaV1InnerServiceSMOImpl;
@Override
@@ -72,7 +70,7 @@
JSONObject fee = orderInfo.getJSONObject("data");
//double money = fee.getDouble("payCharge");
- BigDecimal money = new BigDecimal(fee.getDouble("payCharge"));
+ BigDecimal money = new BigDecimal(fee.getDouble("amount"));
//3.0 鑰冭檻浼樻儬鍗� 杩欓噷涓嶈�冭檻浜� 鍥犱负 鐗╄仈缃戝钩鍙板凡缁� 鑰冭檻杩囦簡
// double couponPrice = checkCouponUser(reqJson);
@@ -102,6 +100,15 @@
throw new CmdException("宸茬粡澶勭悊杩囦簡 鍐嶄笉澶勭悊");
}
JSONObject paramObj = JSONObject.parseObject(paramIn);
+
+ ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+ parkingAreaDto.setPaId(paramObj.getString("paId"));
+ List<ParkingAreaDto> parkingAreaDtos = parkingAreaV1InnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+ if(parkingAreaDtos == null || parkingAreaDtos.size()<1){
+ paramObj.put("communityId","-1");
+ }else{
+ paramObj.put("communityId",parkingAreaDtos.get(0).getCommunityId());
+ }
paramObj.putAll(reqJson);
TempCarPayOrderDto tempCarPayOrderDto = BeanConvertUtil.covertBean(paramObj, TempCarPayOrderDto.class);
dealParkingCouponCar(paramObj,tempCarPayOrderDto);
--
Gitblit v1.8.0