From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java | 14 ++++++--------
1 files changed, 6 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 849d74f..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,12 +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.QRActivityCodeVO;
-import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
import com.panzhihua.service_community.entity.ComActActivityCode;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.util.QRCodeUtil;
@@ -18,7 +15,6 @@
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
/**
* 签到二维码表(ComActActivityCode)表控制层
@@ -98,9 +94,11 @@
*/
@PostMapping("/getQRCode")
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()));
+ 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());
+ qrCodeVO.setCodeId(comActActivityCode.getId().toString());
return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
}
return R.fail("该活动无有效二维码");
@@ -117,12 +115,12 @@
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());
+ qrCodeVO.setCodeId(comActActivityCode1.getId().toString());
return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO)));
}
return R.fail();
--
Gitblit v1.7.1