From 6fff9ddba2486cbc3ffb6cecf9beac5fcea63cae Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 20 三月 2024 17:25:08 +0800
Subject: [PATCH] 修改党员双报到 列表积分不显示5
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 159 insertions(+), 18 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 addcff6..37dc7af 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
@@ -3,50 +3,191 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
import com.panzhihua.common.model.vos.community.VolunteerTypeVO;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.VolunteerMerchantDao;
import com.panzhihua.service_community.dao.VolunteerTypeDao;
+import com.panzhihua.service_community.entity.SysUser;
import com.panzhihua.service_community.entity.VolunteerActivity;
import com.panzhihua.service_community.entity.VolunteerMerchant;
import com.panzhihua.service_community.entity.VolunteerType;
+import com.panzhihua.service_community.service.VolunteerIntegralMerchantService;
import com.panzhihua.service_community.service.VolunteerMerchantService;
import com.panzhihua.service_community.service.VolunteerTypeService;
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;
+
+
+ @Resource
+ private VolunteerIntegralMerchantService vimService;
+
@Override
- public R volunteerMerchantGetList(int pageNum, int pageSize, String type) {
- return null;
+ public R getById(String id) {
+ return R.ok(baseMapper.getById(id));
}
@Override
- public R insertVolunteerMerchant(VolunteerTypeVO volunteerTypeVO) {
- return null;
+ public R volunteerMerchantGetList(int pageNum, int pageSize, String merchantState,
+ String merchantType, String name, String communityId) {
+ Page page=new Page<VolunteerMerchant>(pageNum,pageSize);
+ return R.ok(baseMapper.getList(page, merchantState,merchantType,name,communityId));
}
@Override
- public R updateVolunteerMerchant(VolunteerTypeVO volunteerTypeVO) {
- return null;
+ public R insertVolunteerMerchant(VolunteerMerchantVO vtvo)
+ {
+ if(vtvo==null)
+ {
+ return R.fail("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(vtvo.getName()))
+ {
+ return R.fail("商家姓名不能为空");
+ }
+
+ if(StringUtils.isEmpty(vtvo.getBusinessType()))
+ {
+ return R.fail("商家类型不能为空");
+ }
+
+ if(StringUtils.isEmpty(vtvo.getLogoUrl()))
+ {
+ return R.fail("商家logo封面不能为空");
+ }
+
+ if(StringUtils.isEmpty(vtvo.getAddress()))
+ {
+ return R.fail("商家地址不能为空");
+ }
+
+
+ if(StringUtils.isEmpty(vtvo.getLat()))
+ {
+ return R.fail("商家经纬度不能为空");
+ }
+
+
+ if(StringUtils.isEmpty(vtvo.getUserId()))
+ {
+ return R.fail("管理员不能为空");
+ }
+
+
+ if(vtvo.getBusinessStartTime()==null || vtvo.getBusinessEndTime()==null )
+ {
+ return R.fail("营业时间不能为空");
+ }
+
+
+ if(StringUtils.isEmpty(vtvo.getMerchantType()))
+ {
+ return R.fail("营业状态不能为空");
+ }
+
+
+ if(StringUtils.isEmpty(vtvo.getServiceCall()))
+ {
+ return R.fail("对外服务电话不能为空");
+ }
+
+ if(StringUtils.isEmpty(vtvo.getMerchantContent()))
+ {
+ return R.fail("商家简介不能为空");
+ }
+
+ if(StringUtils.isEmpty(vtvo.getMerchantUrl()))
+ {
+ return R.fail("商家图片不能为空");
+ }
+
+
+ if(StringUtils.isEmpty(vtvo.getLegalPersonName()))
+ {
+ return R.fail("法人代表不能为空");
+ }
+
+ if(StringUtils.isEmpty(vtvo.getLegalPersonPhone()))
+ {
+ 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);
+ if(num>0)
+ {
+ return R.ok();
+ }
+ return R.fail("添加失败");
}
@Override
- public R deleteVolunteerMerchant(String id) {
- return null;
+ public R updateVolunteerMerchant(VolunteerMerchantVO vtvo)
+ {
+ if(vtvo==null)
+ {
+ return R.fail("参数不能为空");
+ }
+ int num= baseMapper.Update(vtvo);
+ if(num>0)
+ {
+ return R.ok();
+ }
+ return R.fail("添加失败");
+ }
+
+ @Override
+ public R deleteVolunteerMerchant(String id)
+ {
+
+ int goodNum=vimService.getNum(id);
+
+ if(goodNum>0)
+ {
+ return R.fail("请下架所有商铺商品");
+ }
+
+ int num= baseMapper.delete(id);
+ if(num>0)
+ {
+ return R.ok();
+ }
+ return R.fail("失败");
+ }
+
+ @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));
}
-// @Override
-// public R volunteerTypeDelete(String id) {
-// int num= baseMapper.volunteerTypeDelete(id);
-// if(num>0)
-// {
-// return R.ok();
-// }
-// return R.fail("添加失败");
-// }
}
--
Gitblit v1.7.1