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/charge/ChargeCoreImpl.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
index 315c9f5..05edf8b 100644
--- a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
+++ b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
@@ -3,22 +3,21 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.account.AccountDto;
-import com.java110.dto.chargeMachine.ChargeMachineDto;
-import com.java110.dto.chargeMachine.ChargeMachineFactoryDto;
-import com.java110.dto.chargeMachine.ChargeMachineOrderDto;
-import com.java110.dto.chargeMachine.NotifyChargeOrderDto;
-import com.java110.dto.chargeMachine.ChargeMachineOrderCouponDto;
-import com.java110.dto.chargeMachine.ChargeMachinePortDto;
-import com.java110.dto.chargeMachine.ChargeRuleFeeDto;
-import com.java110.dto.chargeMonthOrder.ChargeMonthOrderDto;
-import com.java110.dto.user.UserDto;
+import com.java110.dto.charge.ChargeMachineDto;
+import com.java110.dto.charge.ChargeMachineFactoryDto;
+import com.java110.dto.charge.ChargeMachineOrderDto;
+import com.java110.dto.charge.NotifyChargeOrderDto;
+import com.java110.dto.charge.ChargeMachineOrderCouponDto;
+import com.java110.dto.charge.ChargeMachinePortDto;
+import com.java110.dto.charge.ChargeRuleFeeDto;
+import com.java110.dto.charge.ChargeMonthOrderDto;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.common.*;
-import com.java110.po.accountDetail.AccountDetailPo;
-import com.java110.po.chargeMachineOrder.ChargeMachineOrderPo;
-import com.java110.po.chargeMachineOrderAcct.ChargeMachineOrderAcctPo;
-import com.java110.po.chargeMachineOrderCoupon.ChargeMachineOrderCouponPo;
-import com.java110.po.chargeMachinePort.ChargeMachinePortPo;
+import com.java110.po.account.AccountDetailPo;
+import com.java110.po.charge.ChargeMachineOrderPo;
+import com.java110.po.charge.ChargeMachineOrderAcctPo;
+import com.java110.po.charge.ChargeMachineOrderCouponPo;
+import com.java110.po.charge.ChargeMachinePortPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
@@ -259,7 +258,7 @@
return true;
}
- @Autowired
+ @Override
public boolean ifStartMonthCard(String personTel, String communityId ) {
ChargeMonthOrderDto chargeMonthOrderDto = new ChargeMonthOrderDto();
@@ -401,8 +400,8 @@
chargeMachinePortV1InnerServiceSMOImpl.updateChargeMachinePort(chargeMachinePortPo);
ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
- chargeMachineOrderDto.setMachineId(chargeMachineDto.getMachineId());
- chargeMachineOrderDto.setPortId(chargeMachinePortDto.getPortId());
+ chargeMachineOrderDto.setMachineId(chargeMachineDtos.get(0).getMachineId());
+ chargeMachineOrderDto.setPortId(chargeMachinePortDtos.get(0).getPortId());
chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_DOING);
List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
--
Gitblit v1.8.0