From e0b8b7ff8f013e7b0986af8643f370a17ab7a366 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:18 +0800
Subject: [PATCH] 优化报表bug
---
service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
index f98de1f..a67f43a 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
@@ -5,13 +5,14 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IComputeFeeSMO;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.user.UserDto;
import com.java110.fee.bmo.ApiBaseBMO;
import com.java110.fee.bmo.fee.IFeeBMO;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
@@ -21,13 +22,14 @@
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.car.CarInoutPo;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeConfigPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
-import com.java110.po.feeReceipt.FeeReceiptPo;
-import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
+import com.java110.po.fee.FeeReceiptPo;
+import com.java110.po.fee.FeeReceiptDetailPo;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
@@ -78,6 +80,9 @@
@Autowired
private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
@@ -417,11 +422,43 @@
if (StringUtil.isEmpty(payFeeDetail.getPayableAmount())) {
payFeeDetail.setPayableAmount("0.0");
}
+ payFeeDetail.setPayOrderId(paramInJson.getString("oId"));
+ // todo 鍒峰叆鏀堕摱浜哄憳淇℃伅
+ freshCashierInfo(payFeeDetail, paramInJson);
+
int flag = payFeeDetailNewV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetail);
if (flag < 1) {
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "淇濆瓨璐圭敤鏄庣粏澶辫触");
}
return businessFeeDetail;
+ }
+
+ /**
+ * 鍒峰叆鏀堕摱浜哄憳
+ *
+ * @param payFeeDetail
+ * @param paramInJson
+ */
+ private void freshCashierInfo(PayFeeDetailPo payFeeDetail, JSONObject paramInJson) {
+ String userId = paramInJson.getString("userId");
+ if (StringUtil.isEmpty(userId)) {
+ payFeeDetail.setCashierId("-1");
+ payFeeDetail.setCashierName("绯荤粺鏀堕摱");
+ return;
+ }
+
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ if (userDtos != null && userDtos.size() > 0) {
+ payFeeDetail.setCashierId(userDtos.get(0).getUserId());
+ payFeeDetail.setCashierName(userDtos.get(0).getName());
+ return;
+ }
+
+ payFeeDetail.setCashierId("-1");
+ payFeeDetail.setCashierName("绯荤粺鏀堕摱");
+
}
/**
@@ -680,7 +717,7 @@
feeAttrPo.setSpecCd(specCd);
feeAttrPo.setValue(value);
feeAttrPo.setFeeId(paramInJson.getString("feeId"));
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
return feeAttrPo;
}
--
Gitblit v1.8.0