From f3e7ecf643ec517ad93b80a50e63eaab90b6461b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 07 二月 2023 15:51:22 +0800
Subject: [PATCH] 三说会堂事件搜索修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java
index ba37814..f28889b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java
@@ -4,11 +4,9 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.api.ApiController;
 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.warehouse.QRCodeVO;
+import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
 import com.panzhihua.service_community.entity.ComActActivityCode;
 import com.panzhihua.service_community.service.ComActActivityCodeService;
 import com.panzhihua.service_community.util.QRCodeUtil;
@@ -17,7 +15,6 @@
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 签到二维码表(ComActActivityCode)表控制层
@@ -96,9 +93,12 @@
      * @return
      */
     @PostMapping("/getQRCode")
-    public R getQRCode(@RequestBody QRCodeVO qrCodeVO){
-        ComActActivityCode comActActivityCode=comActActivityCodeService.getOne(new QueryWrapper<ComActActivityCode>().lambda().eq(ComActActivityCode::getStatus,1).eq(ComActActivityCode::getActivityId,qrCodeVO.getId()).eq(ComActActivityCode::getType,qrCodeVO.getType()));
+    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
+        ComActActivityCode comActActivityCode = comActActivityCodeService.getOne(new QueryWrapper<ComActActivityCode>()
+                .lambda().eq(ComActActivityCode::getStatus,1).eq(ComActActivityCode::getActivityId,qrCodeVO.getId())
+                .eq(ComActActivityCode::getType,qrCodeVO.getType()));
         if(comActActivityCode!=null){
+            qrCodeVO.setCodeId(comActActivityCode.getId().toString());
             return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
         }
         return R.fail("该活动无有效二维码");
@@ -110,16 +110,17 @@
      * @return
      */
     @PostMapping("/resetQRCode")
-    public R resetQRCode(@RequestBody QRCodeVO qrCodeVO){
+    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
         ComActActivityCode comActActivityCode=comActActivityCodeService.getOne(new QueryWrapper<ComActActivityCode>().lambda().eq(ComActActivityCode::getStatus,1).eq(ComActActivityCode::getActivityId,qrCodeVO.getId()).eq(ComActActivityCode::getType,qrCodeVO.getType()));
         if(comActActivityCode!=null){
             comActActivityCodeService.update(new UpdateWrapper<ComActActivityCode>().lambda().eq(ComActActivityCode::getActivityId,qrCodeVO.getId()).eq(ComActActivityCode::getType,qrCodeVO.getType()).set(ComActActivityCode::getStatus,0));
             ComActActivityCode comActActivityCode1=new ComActActivityCode();
-            comActActivityCode1.setActivityId(qrCodeVO.getId().longValue());
+            comActActivityCode1.setActivityId(Long.parseLong(qrCodeVO.getId()));
             comActActivityCode1.setCreateTime(new Date());
             comActActivityCode1.setType(qrCodeVO.getType());
             comActActivityCode1.setStatus(1);
             comActActivityCodeService.save(comActActivityCode1);
+            qrCodeVO.setCodeId(comActActivityCode1.getId().toString());
             return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
         }
         return R.fail();

--
Gitblit v1.7.1