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/PayOweFeeListener.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/PayOweFeeListener.java b/service-api/src/main/java/com/java110/api/listener/fee/PayOweFeeListener.java
index fbd69d5..4320a58 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/PayOweFeeListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/PayOweFeeListener.java
@@ -8,6 +8,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.app.AppDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.dto.repair.RepairDto;
@@ -24,6 +25,7 @@
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -102,6 +104,7 @@
//鏍￠獙鏁版嵁
validate(paramIn);
JSONObject paramObj = JSONObject.parseObject(paramIn);
+ logger.info("======娆犺垂缂磋垂杩斿洖======锛�"+JSONArray.toJSONString(paramObj));
HttpHeaders header = new HttpHeaders();
dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
JSONArray businesses = new JSONArray();
@@ -113,7 +116,15 @@
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
feeObj = fees.getJSONObject(feeIndex);
feeObj.put("communityId", paramObj.getString("communityId"));
- feeObj.put("remark", paramObj.getString("remark"));
+ String remark = paramObj.getString("remark");
+ String paySource = "鐜板満鏀堕摱鍙版敮浠�";
+ if (!StringUtil.isEmpty(remark)) {
+ remark = "-" + remark;
+ } else {
+ remark = "";
+ }
+ feeObj.put("remark", paySource + remark);
+
getFeeReceiptDetailPo(dataFlowContext, feeObj, businesses, feeReceiptDetailPos, feeReceiptPos);
}
@@ -139,9 +150,9 @@
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
feeReceiptDetailDto.setDetailIds(detailIds.toArray(new String[detailIds.size()]));
feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
- try{
+ try {
Thread.currentThread().sleep(2000);
- }catch(InterruptedException ie){
+ } catch (InterruptedException ie) {
ie.printStackTrace();
}
List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
@@ -151,10 +162,15 @@
}
private void getFeeReceiptDetailPo(DataFlowContext dataFlowContext, JSONObject paramObj, JSONArray businesses, List<FeeReceiptDetailPo> feeReceiptDetailPos, List<FeeReceiptPo> feeReceiptPos) {
- if(!paramObj.containsKey("primeRate")) {
+ if (!paramObj.containsKey("primeRate")) {
paramObj.put("primeRate", "6");
}
- //paramObj.put("remark", "寰俊鏀粯");
+ String appId = dataFlowContext.getAppId();
+ logger.info("======鏀粯鏂瑰紡======锛�" + appId + "+======+" + paramObj.containsKey("primeRate")+"======:"+JSONArray.toJSONString(dataFlowContext));
+ if (AppDto.OWNER_WECHAT_PAY.equals(appId)) { //寰俊鏀粯锛堟瑺璐圭即璐规棤娉曞尯鍒嗗皬绋嬪簭杩樻槸寰俊鍏紬鍙凤級
+ paramObj.put("remark", "寰俊鏀粯");
+ }
+ paramObj.put("state","1400");
businesses.add(feeBMOImpl.addOweFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPos, feeReceiptPos));
businesses.add(feeBMOImpl.modifyOweFee(paramObj, dataFlowContext));
--
Gitblit v1.8.0