ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -86,7 +86,7 @@ @TableField("end_time") private LocalDateTime endTime; @ApiModelProperty(value = "状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）") @ApiModelProperty(value = "状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）") @TableField("status") private Integer status; @@ -110,7 +110,7 @@ @TableField("recharge_serial_number") private String rechargeSerialNumber; @ApiModelProperty(value = "订单金额") @ApiModelProperty(value = "订单金额(总金额)") @TableField("order_amount") private BigDecimal orderAmount;
New file @@ -0,0 +1,34 @@ package com.ruoyi.order.api.query; import com.ruoyi.common.core.web.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; import java.util.List; @Data @ApiModel(value = "ChargingOrderQuery对象",description = "管理后台充电订单查询对象") public class ChargingOrderQuery extends BasePage { @ApiModelProperty(value = "订单编号") private String code; @ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））") private Integer orderType; @ApiModelProperty(value = "手机号") private String phone; @ApiModelProperty(value = "状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）") private Integer status; @ApiModelProperty(value = "站点id") private Integer siteId; @ApiModelProperty(value = "充电桩ids 逗号拼接") private String pileIds; @ApiModelProperty(value = "充电枪ids 逗号拼接") private String gunIds; @ApiModelProperty(value = "开始时间2020-01-01 00:00:00 - 2021-01-01 23:59:59") private String startTime; @ApiModelProperty(value = "结束时间2020-01-01 00:00:00 - 2021-01-01 23:59:59") private String endTime; @ApiModelProperty(value = "订单来源 1明星 2快电 3新电途") private Integer orderSource; } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
New file @@ -0,0 +1,44 @@ package com.ruoyi.order.api.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TOrderEvaluate; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.List; @Data @ApiModel(value = "SiteDetailEvaluateVO对象",description = "站点详情订单评价") public class ChargingOrderVO extends TChargingOrder { @ApiModelProperty(value = "订单id") private Long id; @ApiModelProperty(value = "用户id") private Long userId; @ApiModelProperty(value = "站点名称") private String siteName; @ApiModelProperty(value = "充电终端名称 桩+枪") private String terminalName; @ApiModelProperty(value = "充电时间 秒") private Integer chargingSecond; @ApiModelProperty(value = "平台手续费") private BigDecimal platFormMoney; @ApiModelProperty(value = "三方平台分佣") private BigDecimal commission; @ApiModelProperty(value = "车牌号") private String licensePlate; @ApiModelProperty(value = "手机号") private String phone; @ApiModelProperty(value = "累计充电量") private BigDecimal chargingCapacity; @ApiModelProperty(value = "累计电费") private BigDecimal electrovalence; @ApiModelProperty(value = "累计服务费") private BigDecimal serviceCharge; @ApiModelProperty(value = "时段数") private Integer count; @ApiModelProperty(value = "1明星充电 2快电 3新电途") private Integer orderSource; } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -78,7 +79,7 @@ * 查询用户可用优惠券数量 * @return */ @ApiOperation(value = "通过桩编号获取电站详情", tags = {"小程序-扫一扫"}) @ApiOperation(value = "通过桩编号和预付金额获取电站详情", tags = {"小程序-扫一扫"}) @GetMapping(value = "/scan/siteInfo") public AjaxResult<SiteInfoVO> siteInfo(Integer id) { TChargingGun chargingGun = chargingGunClient.getChargingGunById(id).getData(); @@ -105,6 +106,15 @@ } } } BigDecimal electrovalence = data.getElectrovalence(); BigDecimal vipElectrovalence = data.getVipElectrovalence(); // 计算预付金额能充多少度普通电 BigDecimal divide1 = money.divide(electrovalence, 2, BigDecimal.ROUND_HALF_UP); // 计算冲会员电能充多少度会员电 BigDecimal divide = vipElectrovalence.divide(electrovalence, 2, BigDecimal.ROUND_HALF_UP); BigDecimal subtract = divide.subtract(divide1); // 优惠金额 data.setMoney(subtract.multiply(vipElectrovalence).setScale(2, BigDecimal.ROUND_HALF_UP)); return AjaxResult.ok(data); } /** ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -88,7 +88,7 @@ // 当前时间属于那个阶段 取哪个阶段的电价 if(LocalTime.now().isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && LocalTime.now().isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){ siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence()); siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP)); siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(4, BigDecimal.ROUND_HALF_UP)); } } siteInfoVO.setName(byId.getName()); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.chargingPile.api.vo.SiteVO; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.service.TokenService; @@ -11,6 +12,12 @@ import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TOrderEvaluate; import com.ruoyi.order.api.query.TChargingCountQuery; import com.ruoyi.order.api.vo.ChargingOrderVO; import com.ruoyi.order.dto.GetMyChargingOrderList; import com.ruoyi.order.dto.GetNoInvoicedOrder; import com.ruoyi.order.dto.MyChargingOrderInfo; import com.ruoyi.order.dto.MyChargingOrderList; import com.ruoyi.order.dto.OrderEvaluateVo; import com.ruoyi.order.dto.*; import com.ruoyi.order.service.TChargingOrderService; import com.ruoyi.order.service.TOrderEvaluateService; @@ -62,6 +69,14 @@ @ResponseBody @PostMapping(value = "/chargingOrder") @ApiOperation(value = "充电桩订单列表", tags = {"管理后台-订单管理"}) public AjaxResult<PageInfo<ChargingOrderVO>> chargingOrder(@RequestBody OrderEvaluateVo dto){ return AjaxResult.success(); } @ResponseBody @PostMapping(value = "/addEvaluate") @ApiOperation(value = "添加评价", tags = {"小程序-扫一扫"}) public AjaxResult getMyChargingOrderList(@RequestBody OrderEvaluateVo dto){ ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Arrays; /** * <p> * 前端控制器 @@ -34,8 +36,8 @@ } @GetMapping("/delete") @ApiOperation(tags = {"管理后台-活动管理"},value = "活动删除") public AjaxResult delete(Integer id) { activityService.removeById(id); public AjaxResult delete(String ids) { activityService.removeBatchByIds(Arrays.asList(ids.split(","))); return AjaxResult.success(); } @PostMapping("/updateVip") ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; /** @@ -42,8 +43,8 @@ } @GetMapping("/delete") @ApiOperation(tags = {"管理后台-广告管理"},value = "广告删除") public AjaxResult delete(Integer id) { advertisingService.removeById(id); public AjaxResult delete(String ids) { advertisingService.removeBatchByIds(Arrays.asList(ids.split(","))); return AjaxResult.success(); } @PostMapping("/updateVip") ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -28,6 +28,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -60,8 +61,8 @@ @GetMapping("/delete") @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券删除") public AjaxResult delete(Integer id) { tCouponService.removeById(id); public AjaxResult delete(String ids) { tCouponService.removeBatchByIds(Arrays.asList(ids.split(","))); return AjaxResult.success(); }
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Arrays; /** * <p> @@ -59,8 +60,8 @@ @GetMapping("/delete") @ApiOperation(tags = {"管理后台-商品管理"},value = "商品删除") public AjaxResult delete(Integer id) { goodsService.removeById(id); public AjaxResult delete(String ids) { goodsService.removeBatchByIds(Arrays.asList(ids.split(","))); return AjaxResult.success(); }
@@ -26,6 +26,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -53,8 +54,8 @@ } @GetMapping("/delete") @ApiOperation(tags = {"管理后台-会员管理"},value = "会员删除") public AjaxResult delete(Integer id) { vipService.removeById(id); public AjaxResult delete(String ids) { vipService.removeBatchByIds(Arrays.asList(ids.split(","))); return AjaxResult.success(); } @PostMapping("/updateVip")
