From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java b/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
index b280f0e..3c78bd7 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
@@ -21,11 +21,9 @@
import com.java110.entity.order.Orders;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IFeeDiscountInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
@@ -35,6 +33,7 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -89,6 +88,12 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+ @Autowired
+ private IApplyRoomDiscountInnerServiceSMO applyRoomDiscountInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeDetailInnerServiceSMO iFeeDetailInnerServiceSMO;
+
@Override
public String getServiceCode() {
return ServiceCodeConstant.SERVICE_CODE_PAY_FEE_PRE;
@@ -126,7 +131,7 @@
} else if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) { //寰俊鍏紬鍙锋敮浠�
paramObj.put("primeRate", "6");
paramObj.put("remark", "绾夸笂鍏紬鍙锋敮浠�");
- }else{
+ } else {
paramObj.put("primeRate", "5");
paramObj.put("remark", "绾夸笂灏忕▼搴忔敮浠�");
}
@@ -140,7 +145,7 @@
addDiscount(paramObj, businesses, dataFlowContext);
}
- dealOwnerCartEndTime(paramObj,businesses);
+ dealOwnerCartEndTime(paramObj, businesses);
//鍒ゆ柇鏄惁鏈夋淳鍗曞睘鎬D
FeeAttrDto feeAttrDto = new FeeAttrDto();
@@ -178,8 +183,8 @@
repairUserPo.setState(RepairUserDto.STATE_FINISH_PAY_FEE);
//濡傛灉鏄緟璇勪环鐘舵�侊紝灏辨洿鏂扮粨鏉熸椂闂�
repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- DecimalFormat df = new DecimalFormat("#.00");
- BigDecimal payment_amount=new BigDecimal(paramObj.getString("receivableAmount"));
+ DecimalFormat df = new DecimalFormat("0.00");
+ BigDecimal payment_amount = new BigDecimal(paramObj.getString("receivableAmount"));
repairUserPo.setContext("宸叉敮浠�" + df.format(payment_amount) + "鍏�");
//鏂板寰呰瘎浠风姸鎬�
JSONObject object = JSONObject.parseObject("{\"datas\":{}}");
@@ -221,7 +226,7 @@
dataFlowContext.setResponseEntity(responseEntity);
}
- private void dealOwnerCartEndTime(JSONObject paramObj,JSONArray businesses) {
+ private void dealOwnerCartEndTime(JSONObject paramObj, JSONArray businesses) {
//涓哄仠杞﹁垂鍗曠嫭澶勭悊
if (paramObj.containsKey("carPayerObjType")
&& FeeDto.PAYER_OBJ_TYPE_CAR.equals(paramObj.getString("carPayerObjType"))) {
@@ -280,6 +285,20 @@
List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
JSONObject discountBusiness = null;
for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
+ if (!StringUtil.isEmpty(computeDiscountDto.getArdId())) {
+ //鏌ヨ pay_fee_detail 鏄惁缂磋垂
+ FeeDetailDto feeDetailDto = new FeeDetailDto();
+ feeDetailDto.setDetailId(paramObj.getString("detailId"));
+ List<FeeDetailDto> feeDetailDtoList = iFeeDetailInnerServiceSMO.queryFeeDetails(feeDetailDto);
+ logger.info("======浣跨敤绌虹疆鎴夸紭鎯犱俊鎭�======ardId======" + computeDiscountDto.getArdId());
+ if (feeDetailDtoList != null && feeDetailDtoList.size() == 1) {
+ ApplyRoomDiscountPo applyRoomDiscountPo = new ApplyRoomDiscountPo();
+ //绌虹疆鎴夸紭鎯犱笉鍙敤
+ applyRoomDiscountPo.setInUse("1");
+ applyRoomDiscountPo.setArdId(computeDiscountDto.getArdId());
+ applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
+ }
+ }
if (computeDiscountDto.getDiscountPrice() <= 0) {
continue;
}
--
Gitblit v1.8.0