java/mx_charging_pile.git

			@@ -2,6 +2,7 @@

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.account.api.feignClient.AppUserCarClient;
			import com.ruoyi.account.api.feignClient.AppUserClient;
			@@ -19,6 +20,8 @@
			import com.ruoyi.chargingPile.api.model.TChargingGun;
			import com.ruoyi.chargingPile.api.model.TChargingPile;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.dto.ChargingOrderGroup;
			import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
			import com.ruoyi.common.core.web.domain.AjaxResult;
			import com.ruoyi.common.core.web.page.BasePage;
			import com.ruoyi.common.core.web.page.PageInfo;
			@@ -62,6 +65,7 @@
			import javax.annotation.Resource;
			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.time.ZoneOffset;
			import java.time.format.DateTimeFormatter;
			@@ -95,7 +99,7 @@
			@Resource
			private ChargingPileClient chargingPileClient;



			@Resource
			private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;

			@@ -109,6 +113,8 @@
			private AliPaymentClient aliPaymentClient;




			@Resource
			private AppUserVipDetailClient appUserVipDetailClient;

			@@ -120,12 +126,13 @@

			@Resource
			private ChargingHandshakeClient chargingHandshakeClient;


			@Resource
			private SendMessageClient sendMessageClient;


			@Resource
			private TOrderEvaluateService orderEvaluateService;


			@Resource
			private AccountingStrategyDetailClient accountingStrategyDetailClient;
			@@ -695,21 +702,18 @@
			chargingOrder.setEndMode(1);
			this.updateById(chargingOrder);
			//调用硬件停止充电，停止成功后开始计算费用退款



			// todo 待完善
			return AjaxResult.success();
			}





			public void endCharge(){


			}







			@Override
			public TCharingOrderVO chargingOrder(ChargingOrderQuery dto) {
			@@ -832,6 +836,52 @@
			}

			@Override
			public List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto) {

			return this.baseMapper.chargingOrderGroup(chargingPercentProvinceDto);
			}

			@Override
			public List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds) {
			return this.baseMapper.charge(sixBefore,siteIds);
			}

			@Override
			public List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore) {
			return this.baseMapper.circle(siteIds,sixBefore);
			}

			@Override
			public Map<String, BigDecimal> countAll(LocalDate sixBefore) {
			return this.baseMapper.countAll(sixBefore);
			}

			@Override
			public List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds) {
			return this.baseMapper.getSumByType(chargingOrderIds);
			}

			@Override
			public List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds) {
			return this.baseMapper.getDateData(chargingOrderIds);
			}

			@Override
			public List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds) {
			return this.baseMapper.getWeekData(chargingOrderIds);
			}

			@Override
			public List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds) {
			return this.baseMapper.getMonthData(chargingOrderIds);
			}

			@Override
			public List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds) {
			return this.baseMapper.getYearData(chargingOrderIds);
			}

			@Override
			public ChargingOrderTimeVO chargingList(ChargingListQuery dto) {
			String startTime1 = null;
			String startTime2 = null;