From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 83 insertions(+), 22 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 5fc59af..90baead 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,11 +3,11 @@
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;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.account.AccountDto;
import com.java110.dto.app.AppDto;
import com.java110.dto.couponUser.CouponUserDto;
import com.java110.dto.fee.FeeAttrDto;
@@ -15,17 +15,17 @@
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;
import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.po.accountDetail.AccountDetailPo;
import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.couponUser.CouponUserPo;
@@ -34,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;
@@ -43,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;
@@ -99,6 +95,9 @@
@Autowired
private ICouponUserDetailV1InnerServiceSMO couponUserDetailV1InnerServiceSMOImpl;
+ @Autowired
+ private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
+
//榛樿搴忓垪
protected static final int DEFAULT_SEQ = 1;
@@ -125,19 +124,20 @@
paramObj.put("remark", "绾夸笂灏忕▼搴忔敮浠�");
}
+ //澶勭悊鐜伴噾璐︽埛
+ dealAccount(paramObj);
+
+ //澶勭悊 浼樻儬鎶樻墸
+ addDiscount(paramObj);
+
+ //淇敼宸蹭娇鐢ㄤ紭鎯犲嵎淇℃伅
+ modifyCouponUser(paramObj);
+
//娣诲姞鍗曞厓淇℃伅
feeBMOImpl.addFeePreDetail(paramObj);
feeBMOImpl.modifyPreFee(paramObj);
- double discountPrice = paramObj.getDouble("discountPrice");
- if (discountPrice > 0) {
- addDiscount(paramObj);
- }
-
dealOwnerCartEndTime(paramObj);
-
- //淇敼宸蹭娇鐢ㄤ紭鎯犲嵎淇℃伅
- modifyCouponUser(paramObj);
//鍒ゆ柇鏄惁鏈夋淳鍗曞睘鎬D
FeeAttrDto feeAttrDto = new FeeAttrDto();
@@ -228,10 +228,63 @@
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
+ private void dealAccount(JSONObject paramObj) {
+
+ if (!paramObj.containsKey("deductionAmount") || paramObj.getDouble("deductionAmount") <= 0) {
+ return;
+ }
+
+ BigDecimal deductionAmount = new BigDecimal(paramObj.getDouble("deductionAmount"));
+
+ JSONArray accountDtos = paramObj.getJSONArray("selectUserAccount");
+ BigDecimal amount = null;
+ 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);
+ }
+ int flag = accountInnerServiceSMOImpl.withholdAccount(accountDetailPo);
+
+ if (flag < 1) {
+ throw new CmdException("鎵ｆ澶辫触");
+ }
+ }
+
+
+ if (deductionAmount.doubleValue() > 0) {
+ throw new CmdException("璐︽埛閲戦涓嶈冻");
+ }
+
+ paramObj.put("remark", paramObj.getString("remark") + "-鐜伴噾璐︽埛鎶垫墸" + paramObj.getDouble("deductionAmount") + "鍏�");
+
+ }
+
private void modifyCouponUser(JSONObject paramObj) {
- FeeDto feeInfo = (FeeDto) paramObj.get("feeInfo");
- List<CouponUserDto> couponUserDtos = (List<CouponUserDto>) paramObj.get("couponUserDtos");
- for (CouponUserDto couponUser : couponUserDtos) {
+ if (!paramObj.containsKey("couponPrice") || paramObj.getDouble("couponPrice") <= 0) {
+ return;
+ }
+ //FeeDto feeInfo = (FeeDto) paramObj.get("feeInfo");
+ CouponUserDto couponUserDto = null;
+ 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) {
+ throw new CmdException("浼樻儬鍒歌浣跨敤");
+ }
CouponUserPo couponUserPo = new CouponUserPo();
couponUserPo.setState(CouponUserDto.COUPON_STATE_STOP);
couponUserPo.setCouponId(couponUser.getCouponId());
@@ -245,8 +298,8 @@
couponUserDetailPo.setUserId(couponUser.getUserId());
couponUserDetailPo.setCouponName(couponUser.getCouponName());
couponUserDetailPo.setUserName(couponUser.getUserName());
- couponUserDetailPo.setObjId(feeInfo.getFeeId());
- couponUserDetailPo.setObjType(feeInfo.getFeeTypeCd());
+ couponUserDetailPo.setObjId(paramObj.getString("feeId"));
+ couponUserDetailPo.setObjType(paramObj.getString("feeTypeCd"));
couponUserDetailPo.setOrderId(paramObj.getString("oId"));
fage = couponUserDetailV1InnerServiceSMOImpl.saveCouponUserDetail(couponUserDetailPo);
if (fage < 1) {
@@ -254,11 +307,19 @@
}
}
+ paramObj.put("remark", paramObj.getString("remark") + "-浼樻儬鍔垫姷鎵�" + paramObj.getDouble("couponPrice") + "鍏�");
+
}
private void addDiscount(JSONObject paramObj) {
- List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
- for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
+
+ if (!paramObj.containsKey("discountPrice") || paramObj.getDouble("discountPrice") <= 0) {
+ return;
+ }
+ 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