From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/QueryTempCarFeeOrderCmd.java | 90 +++------------------------------------------
1 files changed, 6 insertions(+), 84 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/QueryTempCarFeeOrderCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/QueryTempCarFeeOrderCmd.java
index 47e6747..4c2bdcfa 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/QueryTempCarFeeOrderCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/QueryTempCarFeeOrderCmd.java
@@ -1,28 +1,14 @@
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.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.fee.ITempCarFeeCreateOrderV1InnerServiceSMO;
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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
/**
* 绫昏〃杩帮細鍒犻櫎
@@ -35,11 +21,10 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "tempCarFee.queryTempCarFeeOrder")
-public class QueryTempCarFeeOrderCmd extends AbstractServiceCmdListener {
+public class QueryTempCarFeeOrderCmd extends Cmd {
@Autowired
- private ICouponUserV1InnerServiceSMO couponUserV1InnerServiceSMOImpl;
- @Autowired
- private IGetTempCarFeeRules getTempCarFeeRulesImpl;
+ private ITempCarFeeCreateOrderV1InnerServiceSMO tempCarFeeCreateOrderV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -51,71 +36,8 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- TempCarPayOrderDto tempCarPayOrderDto = new TempCarPayOrderDto();
- tempCarPayOrderDto.setPaId(reqJson.getString("paId"));
- tempCarPayOrderDto.setCarNum(reqJson.getString("carNum"));
- 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));
- JSONObject outParm = new JSONObject();
- outParm.put("data",fee);
- outParm.put("code","0");
- outParm.put("msg","鎴愬姛");
- ResponseEntity<String> responseEntitys = new ResponseEntity<>(outParm.toJSONString(), HttpStatus.OK);
- fee.putAll(reqJson);
- CommonCache.setValue("queryTempCarFeeOrder" + fee.getString("oId"), fee.toJSONString(), 24 * 60 * 60);
- cmdDataFlowContext.setResponseEntity(responseEntitys);
+ cmdDataFlowContext.setResponseEntity(tempCarFeeCreateOrderV1InnerServiceSMOImpl.createOrder(reqJson));
}
- 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();
- }
}
--
Gitblit v1.8.0