From 818f57f0a4a1000f0b5af3e1d26079abcf25f131 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 30 十二月 2021 09:12:01 +0800
Subject: [PATCH] 优化优惠券抵扣
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
index 9d3882b..2b1a09a 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.context.DataFlowContext;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
@@ -16,10 +15,8 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
-import com.java110.entity.order.Orders;
import com.java110.fee.bmo.fee.IFeeBMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
@@ -37,8 +34,6 @@
import com.java110.po.owner.RepairUserPo;
import com.java110.po.payFeeDetailDiscount.PayFeeDetailDiscountPo;
import com.java110.utils.cache.CommonCache;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -46,8 +41,6 @@
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import java.math.BigDecimal;
import java.text.DecimalFormat;
@@ -237,53 +230,59 @@
private void dealAccount(JSONObject paramObj) {
- if(!paramObj.containsKey("deductionAmount") || paramObj.getDouble("deductionAmount") <=0){
- return ;
+ if (!paramObj.containsKey("deductionAmount") || paramObj.getDouble("deductionAmount") <= 0) {
+ return;
}
BigDecimal deductionAmount = new BigDecimal(paramObj.getDouble("deductionAmount"));
- List<AccountDto> accountDtos = (List<AccountDto>) paramObj.get("selectUserAccount");
+ JSONArray accountDtos = paramObj.getJSONArray("selectUserAccount");
BigDecimal amount = null;
- for(AccountDto accountDto : accountDtos){
-
+ AccountDto accountDto = null;
+ for (int accountIndex = 0; accountIndex < accountDtos.size(); accountIndex++) {
+ accountDto = BeanConvertUtil.covertBean(accountDtos.getJSONObject(accountIndex), AccountDto.class);
amount = new BigDecimal(Double.parseDouble(accountDto.getAmount()));
AccountDetailPo accountDetailPo = new AccountDetailPo();
accountDetailPo.setAcctId(accountDto.getAcctId());
accountDetailPo.setObjId(accountDto.getObjId());
- if(amount.doubleValue()< deductionAmount.doubleValue()){
- accountDetailPo.setAmount(amount.doubleValue()+"");
- deductionAmount = deductionAmount.subtract(amount).setScale(2,BigDecimal.ROUND_HALF_UP);
- }else{
- accountDetailPo.setAmount(deductionAmount.doubleValue()+"");
- deductionAmount = deductionAmount.subtract(deductionAmount).setScale(2,BigDecimal.ROUND_HALF_UP);
+ if (amount.doubleValue() < deductionAmount.doubleValue()) {
+ accountDetailPo.setAmount(amount.doubleValue() + "");
+ deductionAmount = deductionAmount.subtract(amount).setScale(2, BigDecimal.ROUND_HALF_UP);
+ } else {
+ accountDetailPo.setAmount(deductionAmount.doubleValue() + "");
+ deductionAmount = deductionAmount.subtract(deductionAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
}
int flag = accountInnerServiceSMOImpl.withholdAccount(accountDetailPo);
- if(flag < 1){
- throw new CmdException("鎵ｆ澶辫触");
+ if (flag < 1) {
+ throw new CmdException("鎵ｆ澶辫触");
}
}
- if(deductionAmount.doubleValue()>0){
+
+ if (deductionAmount.doubleValue() > 0) {
throw new CmdException("璐︽埛閲戦涓嶈冻");
}
+
+ paramObj.put("remark", paramObj.getString("remark") + "-鐜伴噾璐︽埛鎶垫墸" + paramObj.getDouble("deductionAmount") + "鍏�");
}
private void modifyCouponUser(JSONObject paramObj) {
- if(!paramObj.containsKey("couponPrice") || paramObj.getDouble("couponPrice")<=0){
- return ;
+ if (!paramObj.containsKey("couponPrice") || paramObj.getDouble("couponPrice") <= 0) {
+ return;
}
FeeDto feeInfo = (FeeDto) paramObj.get("feeInfo");
- List<CouponUserDto> couponUserDtos = (List<CouponUserDto>) paramObj.get("couponUserDtos");
CouponUserDto couponUserDto = null;
- for (CouponUserDto couponUser : couponUserDtos) {
+ JSONArray couponUserDtos = paramObj.getJSONArray("couponUserDtos");
+ CouponUserDto couponUser = null;
+ for (int accountIndex = 0; accountIndex < couponUserDtos.size(); accountIndex++) {
+ couponUser = BeanConvertUtil.covertBean(couponUserDtos.getJSONObject(accountIndex), CouponUserDto.class);
couponUserDto = new CouponUserDto();
couponUserDto.setCouponId(couponUser.getCouponId());
couponUserDto.setState(CouponUserDto.COUPON_STATE_RUN);
List<CouponUserDto> couponUserDtos1 = couponUserV1InnerServiceSMOImpl.queryCouponUsers(couponUserDto);
- if(couponUserDtos1==null || couponUserDtos1.size()<1){
+ if (couponUserDtos1 == null || couponUserDtos1.size() < 1) {
throw new CmdException("浼樻儬鍒歌浣跨敤");
}
CouponUserPo couponUserPo = new CouponUserPo();
@@ -308,15 +307,19 @@
}
}
+ paramObj.put("remark", paramObj.getString("remark") + "-浼樻儬鍔垫姷鎵�" + paramObj.getDouble("couponPrice") + "鍏�");
+
}
private void addDiscount(JSONObject paramObj) {
- if (!paramObj.containsKey("discountPrice") || paramObj.getDouble("discountPrice") <=0) {
- return ;
+ if (!paramObj.containsKey("discountPrice") || paramObj.getDouble("discountPrice") <= 0) {
+ return;
}
- List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
- for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
+ JSONArray computeDiscountDtos = paramObj.getJSONArray("computeDiscountDtos");
+ ComputeDiscountDto computeDiscountDto = null;
+ for (int accountIndex = 0; accountIndex < computeDiscountDtos.size(); accountIndex++) {
+ computeDiscountDto = BeanConvertUtil.covertBean(computeDiscountDtos.getJSONObject(accountIndex), ComputeDiscountDto.class);
if (computeDiscountDto.getDiscountPrice() <= 0) {
continue;
}
--
Gitblit v1.8.0