From 7338f68a8dcbd064127b46f1a5b076219cb2baff Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 31 八月 2023 13:35:40 +0800
Subject: [PATCH] 修改志愿者活动积分发放接口 新增小程序社区积分兑换取消
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java
index b432ad6..0e32b08 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java
@@ -17,11 +17,22 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
@Slf4j
@Service
public class VolunteerMerchantServiceImpl extends ServiceImpl<VolunteerMerchantDao,
- VolunteerMerchant> implements VolunteerMerchantService {
+ VolunteerMerchant> implements VolunteerMerchantService
+{
+ @Resource
+ private VolunteerMerchantService vmService;
+
+ @Override
+ public R getById(String id) {
+ return R.ok(baseMapper.getById(id));
+ }
+
@Override
public R volunteerMerchantGetList(int pageNum, int pageSize, String merchantState,
String merchantType, String name, String communityId) {
@@ -108,10 +119,16 @@
return R.fail("法人联系电话不能为空");
}
-
if(StringUtils.isEmpty(vtvo.getLegalPersonIdCard()))
{
return R.fail("法人身份证不能为空");
+ }
+
+ R<String> isM=vmService.isMerchant(vtvo.getUserId());
+
+ if(!StringUtils.isEmpty(isM.getData()))
+ {
+ return R.fail("已有商家！不能重复添加");
}
int num= baseMapper.insertData(vtvo);
@@ -226,6 +243,11 @@
}
@Override
+ public R isMerchant(String userId) {
+ return R.ok(baseMapper.isMerchant(userId));
+ }
+
+ @Override
public R getUser(String communityId, String userName, String userPhone)
{
return R.ok(baseMapper.getUser(communityId,userName,userPhone));
--
Gitblit v1.7.1