From 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 23:07:46 +0800
Subject: [PATCH] 合并远程分支，并处理冲突
---
service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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 69c723e..b280f0e 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
@@ -12,7 +12,9 @@
import com.java110.dto.app.AppDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDetailDto;
+import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
+import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.entity.center.AppService;
@@ -23,6 +25,8 @@
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeDiscountInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.po.car.OwnerCarPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
import com.java110.utils.constant.BusinessTypeConstant;
@@ -42,6 +46,7 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
/**
@@ -80,6 +85,9 @@
@Autowired
private IRepairUserInnerServiceSMO repairUserInnerServiceSMO;
+
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
@Override
public String getServiceCode() {
@@ -131,6 +139,8 @@
if (discountPrice > 0) {
addDiscount(paramObj, businesses, dataFlowContext);
}
+
+ dealOwnerCartEndTime(paramObj,businesses);
//鍒ゆ柇鏄惁鏈夋淳鍗曞睘鎬D
FeeAttrDto feeAttrDto = new FeeAttrDto();
@@ -211,6 +221,34 @@
dataFlowContext.setResponseEntity(responseEntity);
}
+ private void dealOwnerCartEndTime(JSONObject paramObj,JSONArray businesses) {
+ //涓哄仠杞﹁垂鍗曠嫭澶勭悊
+ if (paramObj.containsKey("carPayerObjType")
+ && FeeDto.PAYER_OBJ_TYPE_CAR.equals(paramObj.getString("carPayerObjType"))) {
+ Date feeEndTime = (Date) paramObj.get("carFeeEndTime");
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCommunityId(paramObj.getString("communityId"));
+ ownerCarDto.setCarId(paramObj.getString("carPayerObjId"));
+ List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+ //杞︿綅璐圭敤缁
+ if (ownerCarDtos != null) {
+ for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
+ if (tmpOwnerCarDto.getEndTime().getTime() < feeEndTime.getTime()) {
+ JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+ business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_CAR);
+ business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
+ business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ OwnerCarPo ownerCarPo = new OwnerCarPo();
+ ownerCarPo.setMemberId(tmpOwnerCarDto.getMemberId());
+ ownerCarPo.setEndTime(DateUtil.getFormatTimeString(feeEndTime, DateUtil.DATE_FORMATE_STRING_A));
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(OwnerCarPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(ownerCarPo));
+ businesses.add(business);
+ }
+ }
+ }
+ }
+ }
+
private void judgeDiscount(JSONObject paramObj) throws ParseException {
FeeDetailDto feeDetailDto = new FeeDetailDto();
feeDetailDto.setCommunityId(paramObj.getString("communityId"));
--
Gitblit v1.8.0