From da3b5c72fa45bc26a9868c2b26e3efda14845179 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 17 四月 2023 01:01:36 +0800
Subject: [PATCH] 加入搜索
---
service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java
index 88cab4e..aca197d 100644
--- a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java
@@ -18,15 +18,14 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.common.charge.IChargeCore;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.chargeMachine.ChargeRuleFeeDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.intf.common.IChargeMachineV1InnerServiceSMO;
+import com.java110.intf.common.IChargeRuleFeeV1InnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
-import com.java110.po.chargeMachine.ChargeMachinePo;
import com.java110.utils.cache.UrlCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -65,6 +64,9 @@
private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;
@Autowired
+ private IChargeRuleFeeV1InnerServiceSMO chargeRuleFeeV1InnerServiceSMOImpl;
+
+ @Autowired
private IChargeCore chargeCoreImpl;
@Override
@@ -88,6 +90,9 @@
// todo 鏌ヨ璁惧鏄惁鍦ㄧ嚎
queryMachineState(chargeMachineDtos);
+
+ // todo 鍒峰叆绠楄垂瑙勫垯
+ queryChargeRuleFee(chargeMachineDtos);
} else {
chargeMachineDtos = new ArrayList<>();
}
@@ -99,10 +104,24 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+ private void queryChargeRuleFee(List<ChargeMachineDto> chargeMachineDtos) {
+ if (chargeMachineDtos == null || chargeMachineDtos.size() != 1) {
+ return;
+ }
+
+ ChargeRuleFeeDto chargeRuleFeeDto = new ChargeRuleFeeDto();
+ chargeRuleFeeDto.setRuleId(chargeMachineDtos.get(0).getRuleId());
+ chargeRuleFeeDto.setCommunityId(chargeMachineDtos.get(0).getCommunityId());
+ List<ChargeRuleFeeDto> fees = chargeRuleFeeV1InnerServiceSMOImpl.queryChargeRuleFees(chargeRuleFeeDto);
+
+ chargeMachineDtos.get(0).setFees(fees);
+
+ }
+
private void queryMachineState(List<ChargeMachineDto> chargeMachineDtos) {
- if(chargeMachineDtos == null || chargeMachineDtos.size() < 1 || chargeMachineDtos.size() > 10){
- return ;
+ if (chargeMachineDtos == null || chargeMachineDtos.size() < 1 || chargeMachineDtos.size() > 10) {
+ return;
}
chargeCoreImpl.queryChargeMachineState(chargeMachineDtos);
--
Gitblit v1.8.0