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/cmd/fee/PayFeeCmd.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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 52ca884..b8902c8 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
@@ -21,6 +21,7 @@
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;
@@ -59,7 +61,7 @@
/**
* 鍓嶅彴 鐜伴噾鎴栬�呰浆璐︽敹璐� 缂磋垂澶勭悊绫�
- *
+ * <p>
* 鍋囧 缂磋垂 鍚庤澶勭悊涓�浜涢�昏緫寤鸿鐢╠atabus
* 杩欎釜绫诲凡缁忓緢澶嶆潅 锛屾渶濂戒笉瑕佸姞鏂伴�昏緫
*/
@@ -134,6 +136,8 @@
@Autowired
private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@Override
@@ -199,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");
@@ -217,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("缂磋垂澶辫触");
@@ -552,17 +565,17 @@
throw new IllegalArgumentException("杞︿綅宸茶浣跨敤锛屼笉鑳藉啀缂磋垂锛�");
}
- if(ParkingSpaceDto.TYPE_CD_SON_MOTHER.equals(parkingSpaceDtos.get(0).getTypeCd())
+ 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);
+ if (sonMotherParking) {
+ queryMotherOwnerCars(num, ownerCarDtos, psId);
}
@@ -590,24 +603,24 @@
}
-
}
/**
* 瀛愭瘝杞︿綅寤舵湡 姣嶈溅浣嶄篃闇�瑕佸欢鏈�
+ *
* @param num
* @param ownerCarDtos
*/
- private void queryMotherOwnerCars(String num, List<OwnerCarDto> ownerCarDtos,String paId) {
+ private void queryMotherOwnerCars(String num, List<OwnerCarDto> ownerCarDtos, String paId) {
String sonMotherSwitch = CommonCache.getValue("SON_MOTHER_PARKING_AUTO_FEE");
- if(!"ON".equals(sonMotherSwitch)){
- return ;
+ if (!"ON".equals(sonMotherSwitch)) {
+ return;
}
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
- parkingSpaceDto.setNum(num+ParkingSpaceDto.NUM_MOTHER);
+ parkingSpaceDto.setNum(num + ParkingSpaceDto.NUM_MOTHER);
parkingSpaceDto.setPaId(paId);
List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅淇℃伅閿欒锛�");
@@ -618,7 +631,7 @@
ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
List<OwnerCarDto> tmpOwnerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- if(ownerCarDtos == null){
+ if (ownerCarDtos == null) {
ownerCarDtos = new ArrayList<>();
}
--
Gitblit v1.8.0