From 65745e49e9255e1e043c1ee2d6122c789fd69e83 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 16 八月 2024 14:22:06 +0800
Subject: [PATCH] 管理后台优惠券新增封面图 详情图
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 8 ++--
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java | 4 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 12 +++++-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 2 +
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CarListVO.java | 21 ++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 20 ++++++++++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java | 8 +++
8 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CarListVO.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CarListVO.java
new file mode 100644
index 0000000..97640c6
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CarListVO.java
@@ -0,0 +1,21 @@
+package com.ruoyi.account.api.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "CarListVO对象",description = "小程序-扫一扫选择车辆")
+public class CarListVO {
+
+ @ApiModelProperty(value = "图片")
+ private String reviewRate;
+
+ @ApiModelProperty(value = "车型-车牌号")
+ private String evaluateCount;
+ @ApiModelProperty(value = "车辆id")
+ private Long driverId;
+
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
index b0cf1c1..5753b57 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
@@ -28,6 +28,10 @@
private LocalDateTime endTime;
@ApiModelProperty(value = "关联订单")
private String orderId;
+ @ApiModelProperty(value = "封面图")
+ private String coverPicture;
+ @ApiModelProperty(value = "详情图")
+ private String detailsPicture;
@ApiModelProperty(value = " 前端忽略 获取方式 1=积分兑换 2现金购买")
private Integer waysToObtain;
@ApiModelProperty(value = "优惠券id")
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 7cfd713..9f1178f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -50,7 +50,7 @@
@ApiModelProperty(value = "充电车辆 id")
@TableField("app_user_car_id")
- private Integer appUserCarId;
+ private Long appUserCarId;
@ApiModelProperty(value = "站点 id")
@TableField("site_id")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
index cd229d3..8073eef 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
@@ -99,10 +99,16 @@
@TableField("explain")
private String explain;
+ @ApiModelProperty(value = "封面图")
+ @TableField("cover_picture")
+ private String coverPicture;
+ @ApiModelProperty(value = "详情图片")
+ @TableField("details_picture")
+ private String detailsPicture;
+
@ApiModelProperty(value = "说明")
@TableField("remark")
private String remark;
-
@ApiModelProperty(value = "状态（1=上架，2=下架）")
@TableField("status")
private Integer status;
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index 5f5f700..26d4687 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -48,14 +48,22 @@
* @param dto
* @return
*/
-
@ApiOperation(value = "选择优惠券分页查询", tags = {"小程序-扫一扫"})
@PostMapping(value = "/scan/couponList")
public AjaxResult<PageInfo<CouponListVOVO>> couponList(@RequestBody CouponListDto dto) {
-
PageInfo<CouponListVOVO> res = tAppCouponService.couponList(dto);
return AjaxResult.ok(res);
}
+ /**
+ *
+ * @param dto
+ * @return
+ */
+ @ApiOperation(value = "选择车辆列表", tags = {"小程序-扫一扫"})
+ @PostMapping(value = "/scan/carList")
+ public AjaxResult<CouponListVOVO> carList(@RequestBody CouponListDto dto) {
+ return AjaxResult.success();
+ }
/**
* 管理后台远程调用 根据优惠券ids 查询对应的发放数量
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index d05882b..075ac4a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -26,6 +27,25 @@
@Resource
private TChargingOrderService chargingOrderService;
+ /**
+ * 查询用户最近一次充电记录使用的车辆
+ * @param
+ * @return
+ */
+ @PostMapping(value = "/getCar")
+ public R<Long> getCar() {
+ // todo 获取用户id
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>()
+ .eq(TChargingOrder::getAppUserId, 11)
+ .isNotNull(TChargingOrder::getAppUserCarId));
+ if (!list.isEmpty()){
+ // 最近使用的车辆id
+ Long size = list.get(0).getAppUserCarId();
+ return R.ok(size);
+ }else{
+ return R.ok(-1L);
+ }
+ }
/**
* 查询会员在本月有多少次享受了充电折扣
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
index f2d803e..bc579b9 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -87,6 +87,8 @@
}else{
record.setMeetTheConditions("满"+byId.getMeetTheConditions()+"元可用");
}
+ record.setCoverPicture(byId.getCoverPicture());
+ record.setDetailsPicture(byId.getDetailsPicture());
}
}
return AjaxResult.ok(data);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
index 712ef14..772d11a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
@@ -33,19 +33,19 @@
@Autowired
private TIntegralRuleService integralRuleService;
@GetMapping("/getSet")
- @ApiOperation(value = "获取积分设置")
+ @ApiOperation(tags = {"管理后台-积分管理"},value = "获取积分设置")
public R<TIntegralRule> getSet() {
TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
return R.ok(res);
}
@PostMapping("/saveSet")
- @ApiOperation(value = "保存积分设置")
+ @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分设置")
public R saveSet(@RequestBody TIntegralRule dto) {
integralRuleService.updateById(dto);
return R.ok();
}
@GetMapping("/getInfo")
- @ApiOperation(value = "type 1=积分规则说明，" +
+ @ApiOperation(tags = {"管理后台-积分管理"},value = "type 1=积分规则说明，" +
"2=会员折扣说明，" +
"3=优惠券说明，" +
"4=双倍积分说明，" +
@@ -61,7 +61,7 @@
return R.ok(g.getContent());
}
@GetMapping("/saveInfo")
- @ApiOperation(value = "保存积分说明")
+ @ApiOperation(tags = {"管理后台-积分管理"},value = "保存积分说明")
@ApiImplicitParams({
@ApiImplicitParam(name = "info", value = "内容", required = true),
@ApiImplicitParam(name = "type", value = "type 1=积分规则说明，\" +\n" +
--
Gitblit v1.7.1