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/PayBatchFeeCmd.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
index 4479e73..cdb25e9 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
@@ -171,6 +171,8 @@
//todo 鐢熸垚鏀舵嵁缂栧彿
String receiptCode = feeReceiptInnerServiceSMOImpl.generatorReceiptCode(reqJson.getString("communityId"));
+ String payOrderId = reqJson.getString("payOrderId");
+
JSONArray fees = reqJson.getJSONArray("fees");
JSONObject paramInObj = null;
@@ -178,7 +180,7 @@
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
try {
paramInObj = fees.getJSONObject(feeIndex);
- doDeal(paramInObj, reqJson.getString("communityId"),receiptCode, cmdDataFlowContext, userDtos.get(0));
+ doDeal(paramInObj, reqJson.getString("communityId"),receiptCode, cmdDataFlowContext, userDtos.get(0),payOrderId);
} catch (Exception e) {
logger.error("澶勭悊寮傚父", e);
throw new CmdException(e.getMessage());
@@ -192,7 +194,10 @@
cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(data));
}
- private void doDeal(JSONObject paramObj, String communityId,String receiptCode, ICmdDataFlowContext cmdDataFlowContext, UserDto userDto) throws Exception {
+ private void doDeal(JSONObject paramObj, String communityId,String receiptCode,
+ ICmdDataFlowContext cmdDataFlowContext,
+ UserDto userDto,
+ String payOrderId) throws Exception {
paramObj.put("communityId", communityId);
//鑾峰彇璁㈠崟ID
String oId = Java110TransactionalFactory.getOId();
@@ -209,6 +214,10 @@
oId = payFeeDetailPo.getDetailId();
}
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