From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 0a5405f..567247d 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,24 +18,21 @@
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.chargeRuleFee.ChargeRuleFeeDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.dto.charge.ChargeRuleFeeDto;
+import com.java110.dto.wechat.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;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.chargeMachine.ChargeMachineDto;
+import com.java110.dto.charge.ChargeMachineDto;
import java.util.List;
import java.util.ArrayList;
@@ -146,7 +143,7 @@
smallWeChatDto.setWeChatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC);
List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
String appId = "";
- if (smallWeChatDtos != null || smallWeChatDtos.size() > 0) {
+ if (smallWeChatDtos != null && smallWeChatDtos.size() > 0) {
appId = smallWeChatDtos.get(0).getAppId();
}
String ownerUrl = UrlCache.getOwnerUrl();
--
Gitblit v1.8.0