From b6949a31464f2ca4e790affd467dcfc511223ba2 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 四月 2023 23:56:00 +0800
Subject: [PATCH] 优化交费 -- 加入收银员功能
---
service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 8fadf6c..83a40f8 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
@@ -12,6 +12,7 @@
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,6 +22,7 @@
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;
@@ -78,6 +80,9 @@
@Autowired
private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
@@ -418,6 +423,9 @@
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, "淇濆瓨璐圭敤鏄庣粏澶辫触");
@@ -426,6 +434,34 @@
}
/**
+ * 鍒峰叆鏀堕摱浜哄憳
+ *
+ * @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("绯荤粺鏀堕摱");
+
+ }
+
+ /**
* 淇敼璐圭敤淇℃伅
*
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
--
Gitblit v1.8.0