From b2b5bdf6f42597e582da96aa56707e1f68d3936e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:41:44 +0800
Subject: [PATCH] 优化 费用
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 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 2b1a09a..e19ce11 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,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
@@ -15,12 +16,14 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.parkingSpaceApply.ParkingSpaceApplyDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
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.IParkingSpaceApplyV1InnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
@@ -32,6 +35,7 @@
import com.java110.po.couponUserDetail.CouponUserDetailPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
+import com.java110.po.parkingSpaceApply.ParkingSpaceApplyPo;
import com.java110.po.payFeeDetailDiscount.PayFeeDetailDiscountPo;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.exception.CmdException;
@@ -94,7 +98,8 @@
private ICouponUserV1InnerServiceSMO couponUserV1InnerServiceSMOImpl;
@Autowired
private ICouponUserDetailV1InnerServiceSMO couponUserDetailV1InnerServiceSMOImpl;
-
+ @Autowired
+ private IParkingSpaceApplyV1InnerServiceSMO parkingSpaceApplyV1InnerServiceSMOImpl;
@Autowired
private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
@@ -107,6 +112,7 @@
}
@Override
+ @Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
String paramIn = CommonCache.getAndRemoveValue("payFeePre" + reqJson.getString("oId"));
JSONObject paramObj = JSONObject.parseObject(paramIn);
@@ -126,6 +132,8 @@
//澶勭悊鐜伴噾璐︽埛
dealAccount(paramObj);
+
+ paramObj.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
//澶勭悊 浼樻儬鎶樻墸
addDiscount(paramObj);
@@ -155,10 +163,6 @@
if (flag < 1) {
throw new CmdException("鏇存柊寰俊娲惧崟姹犱俊鎭け璐�");
}
- }
- //淇敼鎶ヤ慨娲惧崟鐘舵��
- if (feeAttrDtos != null && feeAttrDtos.size() > 0) {
-
RepairUserDto repairUserDto = new RepairUserDto();
repairUserDto.setRepairId(feeAttrDtos.get(0).getValue());
repairUserDto.setState(RepairUserDto.STATE_PAY_FEE);
@@ -173,7 +177,7 @@
DecimalFormat df = new DecimalFormat("0.00");
BigDecimal payment_amount = new BigDecimal(paramObj.getString("receivableAmount"));
repairUserPo.setContext("宸叉敮浠�" + df.format(payment_amount) + "鍏�");
- int flag = repairUserNewV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
+ flag = repairUserNewV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
if (flag < 1) {
throw new CmdException("鏇存柊寰俊娲惧崟姹犱俊鎭け璐�");
}
@@ -207,9 +211,12 @@
//鑾峰彇bId
String bId = feeDetailDtoList.get(0).getbId();
//鑾峰彇浼樻儬
- List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
- if (computeDiscountDtos != null) {
- for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
+ //List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
+ JSONArray computeDiscountDtos = paramObj.getJSONArray("computeDiscountDtos");
+ ComputeDiscountDto computeDiscountDto = null;
+ if (computeDiscountDtos != null && computeDiscountDtos.size() > 0) {
+ for (int accountIndex = 0; accountIndex < computeDiscountDtos.size(); accountIndex++) {
+ computeDiscountDto = BeanConvertUtil.covertBean(computeDiscountDtos.getJSONObject(accountIndex), ComputeDiscountDto.class);
if (!StringUtil.isEmpty(computeDiscountDto.getArdId())) {
ApplyRoomDiscountPo applyRoomDiscountPo = new ApplyRoomDiscountPo();
//灏嗕笟鍔d鏇存柊鍒扮┖缃埧浼樻儬閲岄潰
@@ -223,6 +230,21 @@
}
}
+ }
+ //鍥炶皟鍒ゆ柇 杞︿綅鐢宠琛ㄦ槸鍚︽湁鏁版嵁锛屾湁鏁版嵁鍒欏埛鏂扮敵璇疯〃鐘舵�佷负 3003 瀹屾垚鐘舵�佸嵆鍙�
+ //鍒ゆ柇杞﹁締鏄惁宸茬粡鏈夌敵璇峰崟
+ ParkingSpaceApplyDto parkingSpaceApplyDto = new ParkingSpaceApplyDto();
+ parkingSpaceApplyDto.setFeeId(paramObj.getString("feeId"));
+ parkingSpaceApplyDto.setState("2002");//瀹℃牳涓�
+ List<ParkingSpaceApplyDto> parkingSpaceApplyDtos = parkingSpaceApplyV1InnerServiceSMOImpl.queryParkingSpaceApplys(parkingSpaceApplyDto);
+ if (parkingSpaceApplyDtos != null && parkingSpaceApplyDtos.size() > 0) {
+ ParkingSpaceApplyPo parkingSpaceApplyPo = new ParkingSpaceApplyPo();
+ parkingSpaceApplyPo.setApplyId(parkingSpaceApplyDtos.get(0).getApplyId());
+ parkingSpaceApplyPo.setState("3003");
+ int flag = parkingSpaceApplyV1InnerServiceSMOImpl.updateParkingSpaceApply(parkingSpaceApplyPo);
+ if (flag < 1) {
+ throw new CmdException("鏇存柊杞︿綅鐢宠琛ㄧ姸鎬佸け璐�");
+ }
}
cmdDataFlowContext.setResponseEntity(ResultVo.success());
@@ -245,6 +267,7 @@
AccountDetailPo accountDetailPo = new AccountDetailPo();
accountDetailPo.setAcctId(accountDto.getAcctId());
accountDetailPo.setObjId(accountDto.getObjId());
+ accountDetailPo.setObjType(accountDto.getObjType());
if (amount.doubleValue() < deductionAmount.doubleValue()) {
accountDetailPo.setAmount(amount.doubleValue() + "");
deductionAmount = deductionAmount.subtract(amount).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -272,7 +295,7 @@
if (!paramObj.containsKey("couponPrice") || paramObj.getDouble("couponPrice") <= 0) {
return;
}
- FeeDto feeInfo = (FeeDto) paramObj.get("feeInfo");
+ //FeeDto feeInfo = (FeeDto) paramObj.get("feeInfo");
CouponUserDto couponUserDto = null;
JSONArray couponUserDtos = paramObj.getJSONArray("couponUserDtos");
CouponUserDto couponUser = null;
@@ -298,8 +321,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) {
--
Gitblit v1.8.0