From 0b3ff378a9faaf9d7a4831b7f0de67378fe0dfea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:20:15 +0800
Subject: [PATCH] optimize 统计
---
service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java | 98 +++++++++++++------------------------------------
1 files changed, 26 insertions(+), 72 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java
index ef7f33d..dae5409 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java
@@ -1,28 +1,21 @@
package com.java110.fee.cmd.tempCarFee;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.couponUser.CouponUserDto;
+import com.java110.dto.parking.ParkingBoxAreaDto;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules;
import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
-import com.java110.utils.cache.CommonCache;
+import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
-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;
import org.springframework.http.ResponseEntity;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -36,18 +29,33 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "tempCarFee.getTempCarFeeOrder")
-public class GetTempCarFeeOrderCmd extends AbstractServiceCmdListener {
+public class GetTempCarFeeOrderCmd extends Cmd {
@Autowired
private ICouponUserV1InnerServiceSMO couponUserV1InnerServiceSMOImpl;
@Autowired
private IGetTempCarFeeRules getTempCarFeeRulesImpl;
+ @Autowired
+ private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "paId", "paId涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "carNum", "carNum涓嶈兘涓虹┖");
- Assert.hasKeyAndValue(reqJson, "couponIds", "couponIds涓嶈兘涓虹┖");
+ if(StringUtil.isEmpty(reqJson.getString("paId"))){
+ Assert.hasKeyAndValue(reqJson, "boxId", "boxId涓嶈兘涓虹┖");
+
+ ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
+ parkingBoxAreaDto.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_TRUE);
+ parkingBoxAreaDto.setBoxId(reqJson.getString("boxId"));
+ List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);
+ if(parkingBoxAreaDtos == null || parkingBoxAreaDtos.size()< 1){
+ throw new CmdException("鏈壘鍒板仠杞﹀満");
+ }
+ reqJson.put("paId",parkingBoxAreaDtos.get(0).getPaId());
+ }
+ Assert.hasKeyAndValue(reqJson, "paId", "paId涓嶈兘涓虹┖");
+
}
@@ -56,64 +64,10 @@
TempCarPayOrderDto tempCarPayOrderDto = new TempCarPayOrderDto();
tempCarPayOrderDto.setPaId(reqJson.getString("paId"));
tempCarPayOrderDto.setCarNum(reqJson.getString("carNum"));
+ if(reqJson.containsKey("pccIds") && !StringUtil.isEmpty(reqJson.getString("pccIds"))){
+ tempCarPayOrderDto.setPccIds(reqJson.getString("pccIds").split(","));
+ }
ResponseEntity<String> responseEntity = getTempCarFeeRulesImpl.getTempCarFeeOrder(tempCarPayOrderDto);
-
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- cmdDataFlowContext.setResponseEntity(responseEntity);
- return;
- }
- JSONObject orderInfo = JSONObject.parseObject(responseEntity.getBody().toString());
- if (orderInfo.getIntValue("code") != 0) {
- cmdDataFlowContext.setResponseEntity(responseEntity);
- return;
- }
-
- JSONObject fee = orderInfo.getJSONObject("data");
- //double money = fee.getDouble("payCharge");
- BigDecimal money = new BigDecimal(fee.getDouble("payCharge"));
- //3.0 鑰冭檻浼樻儬鍗�
- double couponPrice = checkCouponUser(reqJson);
- money = money.subtract(new BigDecimal(couponPrice)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
-
- double receivedAmount = money.doubleValue();
- //鎵�鏈� 浼樻儬鎶樻墸璁＄畻瀹屽悗锛屽鏋滄�婚噾棰濆皬浜庣瓑浜�0锛屽垯杩斿洖鎬绘墸娆句负0
- if (receivedAmount <= 0) {
- receivedAmount = 0.0;
- }
- fee.put("receivedAmount", receivedAmount);
- fee.put("oId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_oId));
- ResponseEntity<String> responseEntitys = new ResponseEntity<>(fee.toJSONString(), HttpStatus.OK);
- fee.putAll(reqJson);
- CommonCache.setValue("getTempCarFeeOrder" + fee.getString("oId"), fee.toJSONString(), 24 * 60 * 60);
- cmdDataFlowContext.setResponseEntity(responseEntitys);
- }
-
- private double checkCouponUser(JSONObject paramObj) {
-
- BigDecimal couponPrice = new BigDecimal(0.0);
- String couponIds = paramObj.getString("couponIds");
- if (couponIds == null || "".equals(couponIds)) {
- paramObj.put("couponPrice", couponPrice.doubleValue());
- paramObj.put("couponUserDtos", new JSONArray()); //杩欓噷鑰冭檻绌�
- return couponPrice.doubleValue();
- }
-
- List<String> result = Arrays.asList(couponIds.split(","));
- CouponUserDto couponUserDto = new CouponUserDto();
- couponUserDto.setCouponIds(result.toArray(new String[result.size()]));
- List<CouponUserDto> couponUserDtos = couponUserV1InnerServiceSMOImpl.queryCouponUsers(couponUserDto);
- if (couponUserDtos == null || couponUserDtos.size() < 1) {
- paramObj.put("couponPrice", couponPrice.doubleValue());
- return couponPrice.doubleValue();
- }
- for (CouponUserDto couponUser : couponUserDtos) {
- //涓嶈绠楀凡杩囨湡璐墿鍒搁噾棰�
- if (couponUser.getEndTime().compareTo(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B)) >= 0) {
- couponPrice = couponPrice.add(new BigDecimal(Double.parseDouble(couponUser.getActualPrice())));
- }
- }
- paramObj.put("couponPrice", couponPrice.doubleValue());
- paramObj.put("couponUserDtos", BeanConvertUtil.beanCovertJSONArray(couponUserDtos));
- return couponPrice.doubleValue();
+ cmdDataFlowContext.setResponseEntity(responseEntity);
}
}
--
Gitblit v1.8.0