java/mx_charging_pile.git

			@@ -24,6 +24,7 @@
			import com.ruoyi.common.core.web.page.PageInfo;
			import com.ruoyi.common.security.service.TokenService;
			import com.ruoyi.common.security.utils.SecurityUtils;
			import com.ruoyi.integration.api.feignClient.IntegrationClient;
			import com.ruoyi.other.api.domain.TVip;
			import com.ruoyi.other.api.feignClient.RoleSiteClient;
			import com.ruoyi.other.api.feignClient.UserSiteClient;
			@@ -38,6 +39,7 @@
			import org.springframework.util.CollectionUtils;

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -75,6 +77,9 @@
			private SysUserRoleClient sysUserRoleClient;
			@Resource
			private TParkingLotService parkingLotService;

			@Resource
			private IntegrationClient integrationClient;



			@@ -288,7 +293,7 @@
			TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
			if(Objects.nonNull(vip) && vip.getType() == 2){
			list.forEach(item -> {
			item.setVipElectrovalence(vip.getDiscount().multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
			item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
			});
			}
			}
			@@ -370,7 +375,7 @@
			TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
			if(Objects.nonNull(vip) && vip.getType() == 2){
			list.forEach(item -> {
			item.setVipElectrovalence(vip.getDiscount().multiply(item.getElectrovalence()));
			item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
			});
			}
			}
			@@ -394,5 +399,11 @@
			tChargingGun.setAccountingStrategyId(accountingStrategyId);
			}
			chargingGunService.updateBatchById(list);

			//下发硬件数据
			List<TChargingPile> list1 = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, id).eq(TChargingPile::getDelFlag, 0).list();
			for (TChargingPile tChargingPile : list1) {
			integrationClient.setupBillingModel1(tChargingPile.getCode());
			}
			}
			}