From 0b3ff378a9faaf9d7a4831b7f0de67378fe0dfea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:20:15 +0800
Subject: [PATCH] optimize 统计
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
index 62ea5b7..7da4df7 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -12,15 +12,16 @@
import com.java110.core.log.LoggerFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.account.AccountDto;
-import com.java110.dto.accountDetail.AccountDetailDto;
+import com.java110.dto.account.AccountDetailDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
+import com.java110.dto.fee.FeeReceiptDetailDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.acct.ICouponUserDetailV1InnerServiceSMO;
@@ -29,6 +30,7 @@
import com.java110.intf.fee.*;
import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.accountDetail.AccountDetailPo;
import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
import com.java110.po.car.OwnerCarPo;
@@ -38,6 +40,7 @@
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
import com.java110.po.payFeeDetailDiscount.PayFeeDetailDiscountPo;
+import com.java110.utils.cache.CommonCache;
import com.java110.utils.constant.FeeFlagTypeConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
@@ -56,6 +59,12 @@
import java.text.SimpleDateFormat;
import java.util.*;
+/**
+ * 鍓嶅彴 鐜伴噾鎴栬�呰浆璐︽敹璐� 缂磋垂澶勭悊绫�
+ * <p>
+ * 鍋囧 缂磋垂 鍚庤澶勭悊涓�浜涢�昏緫寤鸿鐢╠atabus
+ * 杩欎釜绫诲凡缁忓緢澶嶆潅 锛屾渶濂戒笉瑕佸姞鏂伴�昏緫
+ */
@Java110Cmd(serviceCode = "fee.payFee")
public class PayFeeCmd extends Cmd {
@@ -127,6 +136,8 @@
@Autowired
private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@Override
@@ -168,7 +179,7 @@
//涓�娆℃�ц垂鐢� 鍜岄棿鎺ユ�ц垂鐢�
Date maxEndTime = feeDtos.get(0).getDeadlineTime();
//鍛ㄦ湡鎬ц垂鐢�
- if (maxEndTime == null) {
+ if (maxEndTime == null || FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
maxEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
}
@@ -192,6 +203,13 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject paramObj) throws CmdException {
logger.debug("paramObj : {}", paramObj);
+
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
+
PayFeePo payFeePo = null;
String requestId = DistributedLock.getLockUUID();
String key = this.getClass().getSimpleName() + paramObj.get("feeId");
@@ -210,11 +228,13 @@
dealUserAccount(paramObj, payFeeDetailPo);
String oId = Java110TransactionalFactory.getOId();
- if(StringUtil.isEmpty(oId)){
+ if (StringUtil.isEmpty(oId)) {
oId = payFeeDetailPo.getDetailId();
}
payFeeDetailPo.setPayOrderId(oId);
+ payFeeDetailPo.setCashierId(userDtos.get(0).getUserId());
+ payFeeDetailPo.setCashierName(userDtos.get(0).getName());
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
if (flag < 1) {
throw new CmdException("缂磋垂澶辫触");
@@ -531,6 +551,8 @@
//鑾峰彇杞︿綅id
String psId = ownerCarDtos.get(0).getPsId();
//鑾峰彇杞﹁締鐘舵��(1001 姝ｅ父鐘舵�侊紝2002 娆犺垂鐘舵�� 3003 杞︿綅閲婃斁)
+ boolean sonMotherParking = false;
+ String num = "";
String carState = ownerCarDtos.get(0).getState();
if (!StringUtil.isEmpty(psId) && "3003".equals(carState)) {
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
@@ -542,6 +564,18 @@
if (!StringUtil.isEmpty(state) && !state.equals("F")) {
throw new IllegalArgumentException("杞︿綅宸茶浣跨敤锛屼笉鑳藉啀缂磋垂锛�");
}
+
+ if (ParkingSpaceDto.TYPE_CD_SON_MOTHER.equals(parkingSpaceDtos.get(0).getTypeCd())
+ && !parkingSpaceDtos.get(0).getTypeCd().contains(ParkingSpaceDto.NUM_MOTHER)
+ ) {
+ sonMotherParking = true;
+ num = parkingSpaceDtos.get(0).getNum();
+ }
+ }
+
+ // todo 瀛楁瘝杞︿綅锛屽瓙杞︿綅缂磋垂 姣嶈溅浣嶅欢鏈�
+ if (sonMotherParking) {
+ queryMotherOwnerCars(num, ownerCarDtos, psId);
}
@@ -571,6 +605,39 @@
}
+ /**
+ * 瀛愭瘝杞︿綅寤舵湡 姣嶈溅浣嶄篃闇�瑕佸欢鏈�
+ *
+ * @param num
+ * @param ownerCarDtos
+ */
+ private void queryMotherOwnerCars(String num, List<OwnerCarDto> ownerCarDtos, String paId) {
+
+ String sonMotherSwitch = CommonCache.getValue("SON_MOTHER_PARKING_AUTO_FEE");
+
+ if (!"ON".equals(sonMotherSwitch)) {
+ return;
+ }
+
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setNum(num + ParkingSpaceDto.NUM_MOTHER);
+ parkingSpaceDto.setPaId(paId);
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅淇℃伅閿欒锛�");
+
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCommunityId(parkingSpaceDtos.get(0).getCommunityId());
+ ownerCarDto.setPsId(parkingSpaceDtos.get(0).getPsId());
+ ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
+ List<OwnerCarDto> tmpOwnerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+ if (ownerCarDtos == null) {
+ ownerCarDtos = new ArrayList<>();
+ }
+
+ ownerCarDtos.addAll(tmpOwnerCarDtos);
+ }
+
/**
* 娣诲姞灏忓尯淇℃伅
--
Gitblit v1.8.0