From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期二, 19 四月 2022 16:32:21 +0800 Subject: [PATCH] 花城E+防疫修改 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 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..2c4dc58 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 @@ -8,6 +8,7 @@ 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; @@ -96,9 +97,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()); return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO))); } return R.fail("该活动无有效二维码"); @@ -110,7 +114,7 @@ * @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)); @@ -120,6 +124,7 @@ comActActivityCode1.setType(qrCodeVO.getType()); comActActivityCode1.setStatus(1); comActActivityCodeService.save(comActActivityCode1); + qrCodeVO.setCodeId(comActActivityCode1.getId()); return R.ok(QRCodeUtil.getBase64QRCode(JSONObject.toJSONString(qrCodeVO))); } return R.fail(); -- Gitblit v1.7.1