ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -180,7 +180,7 @@ // Set From，设置发件人 InternetAddress fromMail = new InternetAddress(from); //设置发件人名称，TODO 换成自己的发件箱 fromMail.setPersonal(MimeUtility.encodeText("明星电力<13281306557@163.com>")); fromMail.setPersonal(MimeUtility.encodeText("明星新能源科技有限公司<13281306557@163.com>")); message.setFrom(fromMail); // Set To: 设置收件人 InternetAddress toMail = new InternetAddress(to); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -516,8 +516,13 @@ TCharingOrderVO res = chargingOrderService.chargingOrder(dto); return AjaxResult.success(res); } public static void main(String[] args) { String temp = "00"; Integer i = Integer.valueOf(temp); System.err.println(i); } @RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR) @ResponseBody @GetMapping(value = "/chargingOrderInfo") @@ -544,9 +549,23 @@ List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, strategyId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) { String format = tChargingOrderAccountingStrategy.getCreateTime().format(formatter); String format = ""; String format1 = ""; String temp1=list.get(0).getStartTime().split(":")[0]; String[] split = tChargingOrderAccountingStrategy.getStartTime().split(":"); if (Integer.parseInt(split[0])>=Integer.valueOf(temp1)){ format = byId.getCreateTime().format(formatter); }else { format = byId.getEndTime().format(formatter); } String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(":"); if (Integer.parseInt(split1[0])<Integer.valueOf(temp1)){ format1 = byId.getCreateTime().format(formatter); }else { format1 = byId.getEndTime().format(formatter); } tChargingOrderAccountingStrategy.setStartTime(format+" "+tChargingOrderAccountingStrategy.getStartTime()); tChargingOrderAccountingStrategy.setEndTime(format+" "+tChargingOrderAccountingStrategy.getEndTime()); tChargingOrderAccountingStrategy.setEndTime(format1+" "+tChargingOrderAccountingStrategy.getEndTime()); if (byId.getVipDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){ BigDecimal multiply = byId.getVipDiscountAmount().divide(byId.getServiceCharge(), 2) .multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice()); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
@@ -57,10 +57,9 @@ @Resource private TokenService tokenService; @Resource private AppUserClient appUserClient; @ResponseBody ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -98,9 +98,7 @@ startTime1 = split[0]; startTime2 = split[1]; } Long userId = tokenService.getLoginUser().getUserid(); // 查询当前登陆人按钮权限 SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData(); List<Site> siteList = siteClient.getSiteAll().getData(); List<TChargingGun> gunList = chargingGunClient.getAllGun().getData(); List<TChargingPile> pileList = chargingGunClient.getAllPile().getData(); @@ -109,9 +107,12 @@ List<TChargingOrder> total = chargingOrderList.selectList(new LambdaQueryWrapper<>(TChargingOrder.class) .eq(TChargingOrder::getRechargePaymentStatus, 2)); List<TChargingOrderRefund> totalRefund = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2).list(); Long userId = tokenService.getLoginUser().getUserid(); // 查询当前登陆人按钮权限 SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData(); Integer roleType = sysUser.getRoleType(); List<Integer> siteIds = new ArrayList<>(); //如果没传siteId,获取当前登陆人所有的siteIds List<Integer> siteIds = new ArrayList<>(); if (dto.getSiteId()==null){ if (userId != null){ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData(); @@ -139,6 +140,10 @@ siteIds = integers; } } if (roleType==1){ siteIds.add(0); } if (siteIds.isEmpty())siteIds.add(-1); dto.setSiteIds(siteIds);
@@ -58,7 +58,7 @@ SELECT vip_id, create_time, (payment_amount - refund_amount) as payment_amount (payment_amount - IFNULL(refund_amount,0)) as payment_amount FROM t_vip_order <where>
