From aad3ae2ba1b14bf7e948a97ceaab2dea5128fb39 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 12 十一月 2022 17:20:34 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
index ec307df..fcfdc64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
@@ -6,8 +6,12 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
+import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
import com.panzhihua.service_community.entity.ComActRaffleRecord;
import com.panzhihua.service_community.service.ComActRaffleRecordService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -47,35 +51,54 @@
}
/**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @ApiOperation("生成二维码")
+ @PostMapping("/getQRCode")
+ public R getQRCode(@RequestBody QRCodeVO qrCodeVO){
+ return this.comActRaffleRecordService.queryQrCode(qrCodeVO);
+ }
+
+ /**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
@GetMapping("{id}")
- public R selectOne(@PathVariable("id") Serializable id) {
- return R.ok(this.comActRaffleRecordService.getById(id));
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.comActRaffleRecordService.selectById(id);
}
/**
* 新增数据
*
- * @param comActRaffleRecord 实体对象
+ * @param comActRaffleRecordVO 实体对象
* @return 新增结果
*/
@PostMapping
- public R insert(@RequestBody ComActRaffleRecord comActRaffleRecord) {
+ public R insert(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
+ ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
+ BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);
return R.ok(this.comActRaffleRecordService.save(comActRaffleRecord));
}
/**
* 修改数据
*
- * @param comActRaffleRecord 实体对象
+ * @param comActRaffleRecordVO 实体对象
* @return 修改结果
*/
@PostMapping("/update")
- public R update(@RequestBody ComActRaffleRecord comActRaffleRecord) {
+ public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
+ ComActRaffleRecord comActRaffleRecord1=comActRaffleRecordService.getById(comActRaffleRecordVO.getId());
+ if(comActRaffleRecord1.getStatus()!=1){
+ return R.fail("核销失败");
+ }
+ ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
+ BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);
return R.ok(this.comActRaffleRecordService.updateById(comActRaffleRecord));
}
@@ -89,4 +112,15 @@
public R delete(@RequestParam("id") Long id) {
return R.ok(this.comActRaffleRecordService.removeById(id));
}
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("export")
+ public R export(@RequestBody CommonPage commonPage) {
+ return this.comActRaffleRecordService.export(commonPage);
+ }
}
--
Gitblit v1.7.1