From 3dfbf2598ab5b16ff76a99c7b75c889e261a08bb Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 18:00:58 +0800
Subject: [PATCH] 1、收银台费用计算后台计算2、优化显示细节问题
---
service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java b/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
index 3c78bd7..8ba49f0 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
@@ -126,13 +126,13 @@
String appId = event.getDataFlowContext().getAppId();
if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)) { //寰俊灏忕▼搴忔敮浠�
- paramObj.put("primeRate", "5");
+ paramObj.put("primeRate", "6");
paramObj.put("remark", "绾夸笂灏忕▼搴忔敮浠�");
} else if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) { //寰俊鍏紬鍙锋敮浠�
- paramObj.put("primeRate", "6");
+ paramObj.put("primeRate", "5");
paramObj.put("remark", "绾夸笂鍏紬鍙锋敮浠�");
} else {
- paramObj.put("primeRate", "5");
+ paramObj.put("primeRate", "6");
paramObj.put("remark", "绾夸笂灏忕▼搴忔敮浠�");
}
@@ -213,6 +213,28 @@
dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.ORDER_PROCESS, Orders.ORDER_PROCESS_ORDER_PRE_SUBMIT);
ResponseEntity<String> responseEntity = feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
+ //鏌ヨ pay_fee_detail 鏄惁缂磋垂
+ FeeDetailDto feeDetailDto = new FeeDetailDto();
+ feeDetailDto.setDetailId(paramObj.getString("detailId"));
+ List<FeeDetailDto> feeDetailDtoList = iFeeDetailInnerServiceSMO.queryBusinessFeeDetails(feeDetailDto);
+ if (feeDetailDtoList != null && feeDetailDtoList.size() == 1) {
+ //鑾峰彇bId
+ String bId = feeDetailDtoList.get(0).getbId();
+ //鑾峰彇浼樻儬
+ List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
+ if (computeDiscountDtos != null) {
+ for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
+ if (!StringUtil.isEmpty(computeDiscountDto.getArdId())) {
+ ApplyRoomDiscountPo applyRoomDiscountPo = new ApplyRoomDiscountPo();
+ //灏嗕笟鍔d鏇存柊鍒扮┖缃埧浼樻儬閲岄潰
+ applyRoomDiscountPo.setbId(bId);
+ applyRoomDiscountPo.setArdId(computeDiscountDto.getArdId());
+ applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
+ }
+ }
+ }
+
+ }
if (responseEntity.getStatusCode() != HttpStatus.OK) {
dataFlowContext.setResponseEntity(responseEntity);
return;
@@ -285,20 +307,6 @@
List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
JSONObject discountBusiness = null;
for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
- if (!StringUtil.isEmpty(computeDiscountDto.getArdId())) {
- //鏌ヨ pay_fee_detail 鏄惁缂磋垂
- FeeDetailDto feeDetailDto = new FeeDetailDto();
- feeDetailDto.setDetailId(paramObj.getString("detailId"));
- List<FeeDetailDto> feeDetailDtoList = iFeeDetailInnerServiceSMO.queryFeeDetails(feeDetailDto);
- logger.info("======浣跨敤绌虹疆鎴夸紭鎯犱俊鎭�======ardId======" + computeDiscountDto.getArdId());
- if (feeDetailDtoList != null && feeDetailDtoList.size() == 1) {
- ApplyRoomDiscountPo applyRoomDiscountPo = new ApplyRoomDiscountPo();
- //绌虹疆鎴夸紭鎯犱笉鍙敤
- applyRoomDiscountPo.setInUse("1");
- applyRoomDiscountPo.setArdId(computeDiscountDto.getArdId());
- applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
- }
- }
if (computeDiscountDto.getDiscountPrice() <= 0) {
continue;
}
--
Gitblit v1.8.0