From 48c9414db4b7c44a43524115570796025d38a653 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 16:37:34 +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 | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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..b351321 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
@@ -15,12 +15,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.*;
@@ -30,8 +32,10 @@
import com.java110.po.car.OwnerCarPo;
import com.java110.po.couponUser.CouponUserPo;
import com.java110.po.couponUserDetail.CouponUserDetailPo;
+import com.java110.po.fee.PayFeePo;
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;
@@ -224,6 +229,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());
}
@@ -272,7 +292,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 +318,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