From e774cbe55d631f425bb7d00214b00894fb382b2d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 07 十一月 2023 00:20:18 +0800
Subject: [PATCH] 支持扫码枪退费功能
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
index e051dc9..680096a 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
@@ -151,6 +151,10 @@
userDto.setUserId(userId);
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
Assert.listOnlyOne(userDtos, "鐢ㄦ埛鏈櫥褰�");
+
+ String payOrderId = paramObj.getString("payOrderId");
+
+
//娣诲姞鍗曞厓淇℃伅
List<FeeReceiptPo> feeReceiptPos = new ArrayList<>();
List<FeeReceiptDetailPo> feeReceiptDetailPos = new ArrayList<>();
@@ -177,7 +181,7 @@
}
//todo 鍘荤即璐�
- getFeeReceiptDetailPo(dataFlowContext, feeObj, feeReceiptDetailPos, feeReceiptPos, userDtos.get(0), receiptCode);
+ getFeeReceiptDetailPo(dataFlowContext, feeObj, feeReceiptDetailPos, feeReceiptPos, userDtos.get(0), receiptCode, payOrderId);
}
@@ -199,7 +203,8 @@
List<FeeReceiptDetailPo> feeReceiptDetailPos,
List<FeeReceiptPo> feeReceiptPos,
UserDto userDto,
- String receiptCode) {
+ String receiptCode,
+ String payOrderId) {
int flag = 0;
if (!paramObj.containsKey("primeRate")) {
paramObj.put("primeRate", "6");
@@ -215,7 +220,7 @@
}
paramObj.put("state", "1400");
// todo 娣诲姞浜よ垂鏄庣粏
- addOweFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPos, feeReceiptPos, userDto, receiptCode);
+ addOweFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPos, feeReceiptPos, userDto, receiptCode,payOrderId);
modifyOweFee(paramObj, dataFlowContext);
//淇敼杞﹁締
@@ -339,7 +344,8 @@
List<FeeReceiptDetailPo> feeReceiptDetailPos,
List<FeeReceiptPo> feeReceiptPos,
UserDto userDto,
- String receiptCode) {
+ String receiptCode,
+ String payOrderId) {
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
@@ -382,6 +388,12 @@
payFeeDetailPo.setPayOrderId(oId);
}
+
+ // todo 濡傛灉 鎵爜鏋敮浠� 杈撳叆鏀粯璁㈠崟ID
+ if(!StringUtil.isEmpty(payOrderId)){
+ payFeeDetailPo.setPayOrderId(payOrderId);
+ }
+
payFeeDetailPo.setCashierId(userDto.getUserId());
payFeeDetailPo.setCashierName(userDto.getName());
//todo 缂撳瓨鏀舵嵁缂栧彿
--
Gitblit v1.8.0