From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java
index 50e9808..d223e2b 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java
@@ -16,11 +16,10 @@
package com.java110.common.smo.impl;
-import com.java110.common.SmartMeter.ISmartMeterFactoryAdapt;
+import com.java110.common.smartMeter.ISmartMeterFactoryAdapt;
import com.java110.common.dao.IMeterMachineV1ServiceDao;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.meterMachineFactory.MeterMachineFactoryDto;
-import com.java110.dto.storeOrderCart.StoreOrderCartDto;
+import com.java110.dto.meterMachine.MeterMachineFactoryDto;
import com.java110.intf.common.IMeterMachineFactoryV1InnerServiceSMO;
import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
import com.java110.dto.meterMachine.MeterMachineDto;
@@ -30,7 +29,6 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
@@ -118,7 +116,7 @@
}
// 閫氱煡 鍘傚閫傞厤鍣ㄦ暟鎹�
- ResultVo resultVo = smartMeterFactoryAdapt.requestRecharge(meterMachineDto, meterMachineDto.getRechargeDegree());
+ ResultVo resultVo = smartMeterFactoryAdapt.requestRecharge(meterMachineDto, meterMachineDto.getRechargeDegree(),meterMachineDto.getRechargeMoney());
return resultVo;
}
--
Gitblit v1.8.0