From f04bb37f47ff1eb51e5e8c42d73514c1e9c33710 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 20 八月 2024 17:22:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 101 insertions(+), 15 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index d028f09..beba41a 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -1,30 +1,40 @@
package com.ruoyi.chargingPile.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.chargingPile.api.dto.TAccountingStrategyDTO;
-import com.ruoyi.chargingPile.api.model.TAccountingStrategy;
-import com.ruoyi.chargingPile.api.model.TAccountingStrategyDetail;
-import com.ruoyi.chargingPile.api.model.TCarport;
-import com.ruoyi.chargingPile.api.model.TVehicleRamp;
+import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.query.TAccountingStrategyQuery;
import com.ruoyi.chargingPile.api.vo.TAccountingStrategyDetailVO;
import com.ruoyi.chargingPile.api.vo.TAccountingStrategyVO;
+import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.chargingPile.service.TAccountingStrategyDetailService;
import com.ruoyi.chargingPile.service.TAccountingStrategyService;
+import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.domain.BaseDelete;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.time.LocalTime;
+import java.util.Arrays;
import java.util.List;
/**
@@ -42,7 +52,12 @@
private final TAccountingStrategyService accountingStrategyService;
private final TAccountingStrategyDetailService accountingStrategyDetailService;
-
+ @Autowired
+ private TChargingPileService chargingPileService;
+ @Autowired
+ private ISiteService siteService;
+ @Autowired
+ private SysUserClient sysUserClient;
@Resource
private TokenService tokenService;
@@ -66,7 +81,7 @@
*/
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理", "管理后台-充电桩信息"},value = "查询计费策略明细列表")
@GetMapping(value = "/queryAccountingStrategyDetailByStrategyId")
- public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam Integer strategyId) {
+ public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam("strategyId") Integer strategyId) {
List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryAccountingStrategyDetailByStrategyId(strategyId);
list.forEach(detail -> {
detail.setTotalPrice(detail.getElectrovalence().add(detail.getElectrovalence()));
@@ -111,8 +126,16 @@
*/
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "查看计费策略详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TAccountingStrategy> getDetailById(@RequestParam Integer id) {
- return AjaxResult.ok(accountingStrategyService.getById(id));
+ public AjaxResult<TAccountingStrategyVO> getDetailById(@RequestParam("id") Integer id) {
+ TAccountingStrategy accountingStrategy = accountingStrategyService.getById(id);
+ TAccountingStrategyVO accountingStrategyVO = new TAccountingStrategyVO();
+ BeanUtils.copyProperties(accountingStrategy,accountingStrategyVO);
+ // 查询用户信息
+ String firstUserName = sysUserClient.getSysUser(accountingStrategy.getFirstUserId()).getData().getNickName();
+ String twoUserName = sysUserClient.getSysUser(accountingStrategy.getTwoUserId()).getData().getNickName();
+ accountingStrategyVO.setFirstUserName(firstUserName);
+ accountingStrategyVO.setTwoUserName(twoUserName);
+ return AjaxResult.ok(accountingStrategyVO);
}
/**
@@ -121,7 +144,7 @@
@Log(title = "删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "删除计费策略")
@DeleteMapping(value = "/deleteById")
- public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
+ public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
// 刪除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
.eq(TAccountingStrategyDetail::getAccountingStrategyId, id));
@@ -134,11 +157,12 @@
@Log(title = "批量删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "批量删除计费策略")
@DeleteMapping(value = "/deleteByIds")
- public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
+ public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
+ String[] split = ids.split(",");
// 刪除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
- .in(TAccountingStrategyDetail::getAccountingStrategyId, ids));
- return AjaxResult.ok(accountingStrategyService.removeByIds(ids));
+ .in(TAccountingStrategyDetail::getAccountingStrategyId, Arrays.asList(split)));
+ return AjaxResult.success(accountingStrategyService.removeByIds(Arrays.asList(split)));
}
@@ -153,7 +177,7 @@
@ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "查询计费审核分页列表")
@PostMapping(value = "/auth/pageList")
- public AjaxResult authPageList(@RequestBody TAccountingStrategyQuery query) {
+ public AjaxResult<PageInfo<TAccountingStrategyVO>> authPageList(@RequestBody TAccountingStrategyQuery query) {
Long userid = tokenService.getLoginUser().getUserid();
Page<TAccountingStrategy> page = accountingStrategyService.lambdaQuery()
.in(TAccountingStrategy::getFirstUserId, userid)
@@ -170,10 +194,72 @@
}
}
-
-
return AjaxResult.ok(accountingStrategyService.pageList(query));
}
+ /**
+ * 小程序远程调用 根据会员折扣、预付金额 计算服务费
+ * @return
+ */
+ @PostMapping(value = "/getServiceMoney")
+ public R<BigDecimal> getServiceMoney(@RequestParam("param") String param){
+ // 桩编号 + 是否是会员 + 内部会员折扣金额 + 普通会员最高折扣金额 + 预付金额
+ String[] split = param.split("-");
+ // 根据桩编号 查询电站
+ TChargingPile one = chargingPileService.lambdaQuery().eq(TChargingPile::getNumber, split[0]).one();
+ Site byId = siteService.getById(one.getSiteId());
+ // 计费策略
+ TAccountingStrategy one1 = accountingStrategyService.lambdaQuery().eq(TAccountingStrategy::getSiteId, byId.getId())
+ .eq(TAccountingStrategy::getAuditStatus, 3).one();
+ // 会员折扣
+ BigDecimal discount = one1.getDiscount();
+ List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, one1.getId())
+ .list();
+ // 当前时间属于哪个计费策略
+ LocalTime now = LocalTime.now();
+ // 电价
+ BigDecimal electronic = new BigDecimal(BigInteger.ZERO);
+ // 最终服务费
+ BigDecimal serviceMoney = new BigDecimal(BigInteger.ZERO);
+ // 预付金额
+ BigDecimal beforeMoney = new BigDecimal(split[4]);
+ // 普通会员最高折扣金额
+ BigDecimal discountMoney = new BigDecimal(split[3]);
+ // 内部会员折扣
+ BigDecimal discountInner = new BigDecimal(split[2]);
+ // 最终服务费
+ BigDecimal res = new BigDecimal(BigInteger.ZERO);
+ for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
+ if (now.isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && now.isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){
+ electronic = tAccountingStrategyDetail.getElectrovalence();
+ // 非会员下的服务费
+ BigDecimal multiply = beforeMoney.multiply(tAccountingStrategyDetail.getServiceCharge()).divide(electronic, 2, RoundingMode.HALF_UP);
+ if (byId.getBusinessCategory() == 1){
+ // 直营才享受会员折扣
+ // 根据电价和预付金额 是否有会员折扣 计算最终服务费
+ if (split[1].equals("1")){
+ // 抵扣金额
+ BigDecimal multiply1 = multiply.multiply(discount);
+ if (multiply1.compareTo(discountMoney)>0){
+ multiply1 = discountMoney;
+ }
+ // 普通最终服务费
+ res = multiply.subtract(multiply1);
+ }
+ if (split[1].equals("2")){
+ // 内部会员折扣 最终服务费
+ res = discountInner.multiply(multiply);
+ }
+ }else{
+ // 非直营
+ res = multiply;
+ }
+ break;
+ }
+ }
+
+
+ return R.ok(res);
+ }
}
--
Gitblit v1.7.1