From a8ba074e4b0807cee707614a55e31e34ea0fbbde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 四月 2021 10:29:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java | 6 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java | 9 +++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java | 4 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java | 3 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvDAO.java | 3 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 13 ++++++
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 3 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java | 27 +++++++++++--
15 files changed, 64 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 8fb47aa..2301858 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -155,6 +155,7 @@
public R addVolunteer(@RequestBody @Validated(AddGroup.class) ComMngVolunteerMngVO comMngVolunteerMngVO){
comMngVolunteerMngVO.setState(1);
comMngVolunteerMngVO.setCommunityId(this.getCommunityId());
+ comMngVolunteerMngVO.setSubmitUserId(this.getUserId());
return communityService.addVolunteer(comMngVolunteerMngVO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
index c4d257e..5d02c0c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
@@ -78,4 +78,7 @@
@ApiModelProperty(value = "用户userid",hidden = true)
private Long userId;
+
+ @ApiModelProperty(value = "申请提交人ID",hidden = true)
+ private Long submitUserId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 71b062f..c82ea64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2158,7 +2158,7 @@
R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId);
/**
- * 微心愿 删除
+ * 微心愿删除
* @param id 微心愿id
*/
@PostMapping("deletemicrowish")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
index ecb2ef7..1f110ee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -393,7 +393,7 @@
}
- @ApiOperation(value = "分页查询微心愿")
+ @ApiOperation(value = "删除心愿")
@PostMapping("deletemicrowish")
public R deleteMicrowish(@RequestParam("id")Long id) {
return communityService.deletemicrowish(id);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 591aab5..deab443 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1450,7 +1450,7 @@
* @param id
* @return
*/
- @GetMapping("deletemicrowish")
+ @PostMapping("deletemicrowish")
public R deletemicrowish(@RequestParam("id") Long id){
return comActMicroWishService.deleteMicroWish(id);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index 41d2770..cce0fae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -122,7 +122,8 @@
"LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id \n" +
"WHERE\n" +
"w.id =#{id}"+
- " group by w.id "
+ " group by w.id " +
+ "order by w.create_at desc"
)
ComActMicroWishVO detailMicroWish(Long id);
@Select("SELECT\n" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
index 479124d..edaf122 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
@@ -22,7 +22,7 @@
" com_act_questnaire aq \n" +
" LEFT JOIN sys_user u on aq.create_by = u.user_id \n" +
" where aq.is_hide=0 " +
- "<if test='communityId != null and communityId!=0 '>\n" +
+ "<if test='communityId != null and communityId!=0l '>\n" +
" and aq.community_id = #{communityId}\n" +
" </if> " +
"<if test='pageQuestnaireDTO.state != null '>\n" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvDAO.java
index 83c9639..9cb60d5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvDAO.java
@@ -67,6 +67,7 @@
"AND #{pageComOpsAdvDTO.offAtEnd}"+
" </if> " +
" </where>" +
+ " order by a.create_at desc" +
"</script>")
IPage<ComOpsAdvVO> pageAdvertisement(Page page, @Param("pageComOpsAdvDTO") PageComOpsAdvDTO pageComOpsAdvDTO);
@Select("SELECT \n" +
@@ -86,6 +87,6 @@
"JOIN com_ops_adv_pos po on a.pos_id=po.id\n" +
"LEFT JOIN com_ops_adv_jump p on a.jump_id=p.id\n" +
"WHERE\n" +
- "a.id=#{id} ")
+ "a.id=#{id} " )
ComOpsAdvVO detailAdvertisement(Long id);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
index 71410ee..028fb8a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java
@@ -71,7 +71,7 @@
"AND d.status in (1,3) \n" +
" </if> " +
"<if test='pageComOpsHouseDTO.houseCommunityName != null and pageComOpsHouseDTO.houseCommunityName.trim() != ""'>" +
- " and d.`house_community_name` LIKE concat( #{pageComOpsHouseDTO.houseCommunityName}, '%' ) \n" +
+ " and d.`house_community_name` LIKE concat( '%', #{pageComOpsHouseDTO.houseCommunityName}, '%' ) \n" +
" </if> " +
"<if test='pageComOpsHouseDTO.mobile != null and pageComOpsHouseDTO.mobile.trim() != ""'>" +
" and d.`mobile` LIKE concat( #{pageComOpsHouseDTO.mobile}, '%' ) \n" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
index 17da593..be98806 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
@@ -22,7 +22,7 @@
"select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`," +
"sale,sale_volume,store_detail,create_at from com_shop_store c" +
" <where>" +
- "c.delete_status=1 and status = 1" +
+ "c.delete_status=1 and c.status = 1" +
"<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>" +
"and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" +
" </if> " +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java
index e201029..09de831 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java
@@ -84,4 +84,8 @@
* 社区id
*/
private Long communityId;
+ /**
+ * 申请提交人ID
+ */
+ private Long submitUserId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 0dba0b2..8214ad8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -56,9 +56,14 @@
comActActivityDO.setPublishAt(now);//发布时间
}
//如果发布时间大于现在时间状态改为进行中
- if(now.getTime()<comActActivityVO.getBeginAt().getTime()){
+ /*if(now.getTime()<comActActivityVO.getBeginAt().getTime()){
comActActivityDO.setStatus(3);
+ }*/
+ //结束时间大于当前时间则设置为“进行中”
+ if(comActActivityVO.getSignUpEnd()!=null && now.getTime()<comActActivityVO.getSignUpEnd().getTime()){
+ comActActivityDO.setStatus(4);
}
+
boolean save = this.save(comActActivityDO);
if(!save){
return R.fail();
@@ -78,6 +83,12 @@
public R putActivity(ComActActivityVO comActActivityVO) {
ComActActivityDO comActActivityDO=new ComActActivityDO();
BeanUtils.copyProperties(comActActivityVO,comActActivityDO);
+
+ //结束时间大于当前时间则设置为“进行中”
+ Date now = new Date();
+ if(comActActivityVO.getSignUpEnd()!=null && now.getTime()<comActActivityVO.getSignUpEnd().getTime()){
+ comActActivityDO.setStatus(4);
+ }
boolean b = this.updateById(comActActivityDO);
if (b) {
return R.ok();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
index bec79a9..47853a8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
@@ -10,9 +10,11 @@
import com.panzhihua.service_community.dao.ComMngCityDAO;
import com.panzhihua.service_community.dao.ComMngDistrictDAO;
import com.panzhihua.service_community.dao.ComMngProvinceDAO;
+import com.panzhihua.service_community.dao.ComMngStructAreaDAO;
import com.panzhihua.service_community.model.dos.ComMngCityDO;
import com.panzhihua.service_community.model.dos.ComMngDistrictDO;
import com.panzhihua.service_community.model.dos.ComMngProvinceDO;
+import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.service.ComMngProvinceService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -34,6 +36,8 @@
@Resource
private ComMngDistrictDAO comMngDistrictDAO;
+ @Resource
+ private ComMngStructAreaDAO comMngStructAreaDAO;
@Override
public R getProvince() {
@@ -80,7 +84,6 @@
List<ComMngAreaVO> vos = new ArrayList<>();
provinceDOS.forEach(p -> {
ComMngAreaVO pvo = new ComMngAreaVO(p.getProvinceAdcode(), p.getProvinceName());
- vos.add(pvo);
List<ComMngCityDO> citys = cityDOS.stream().filter(city -> city.getProvinceAdcode().equals(p.getProvinceAdcode()) && city.getCityAdcode().equals(510400)).collect(Collectors.toList());
citys.forEach(c -> {
ComMngAreaVO cityVo = new ComMngAreaVO(c.getCityAdcode(), c.getCityName());
@@ -93,6 +96,7 @@
cityVo.getChildren().add(districtVo);
});
});
+ vos.add(pvo);
});
return R.ok(vos);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
index 0eb225b..736004d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
@@ -1,4 +1,5 @@
package com.panzhihua.service_community.service.impl;
+import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -119,13 +120,17 @@
BeanUtils.copyProperties(l, comMngRealCompanyDO);
comMngRealCompanyDO.setCommunityId(communityId);
comMngRealCompanyDOS.add(comMngRealCompanyDO);
+ }else{
+ BeanUtils.copyProperties(l, realCompany);
+ realCompany.setCommunityId(communityId);
+ comMngRealCompanyDOS.add(realCompany);
}
});
- boolean batch = this.saveBatch(comMngRealCompanyDOS);
+ boolean batch = this.saveOrUpdateBatch(comMngRealCompanyDOS);
if (batch) {
return R.ok();
}
- return R.fail("请检查数据是否重复，格合是否正确");
+ return R.fail("请检查格式是否正确");
}
@Override
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
index 9e6e1c0..ce306d0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -19,7 +19,9 @@
import com.panzhihua.service_community.dao.ComShopStoreDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
+import com.panzhihua.service_community.model.dos.ComShopOrderDO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;
+import com.panzhihua.service_community.service.ComShopOrderService;
import com.panzhihua.service_community.service.ComShopStoreService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -27,6 +29,8 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @auther lyq
@@ -41,9 +45,6 @@
private ComShopGoodsDAO shopGoodsDAO;
@Resource
private ComShopGoodsAttrDAO comShopGoodsAttrDAO;
- @Resource
- private UserService userService;
-
/**
* 查询店铺列表
*
@@ -57,6 +58,11 @@
IPage<PageShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopStore(page, pageComShopStoreDTO);
return R.ok(comShopStoreVOIPage);
}
+
+ @Resource
+ private UserService userService;
+ @Resource
+ private ComShopOrderService orderService;
/**
* 查询店铺详情
@@ -185,11 +191,22 @@
.lambda().eq(ComShopGoodsDO::getStoreId,shopStoreDO.getId())
.eq(ComShopGoodsDO::getDeleteStatus,ComShopGoodsDO.deleteStatus.no)
.eq(ComShopGoodsDO::getStatus,ComShopGoodsDO.status.sell));
-
if(!shopGoodsList.isEmpty()){//如果有正常商品则提示无法删除
return R.fail("店铺下有商品正在出售，无法删除店铺");
}
-
+ List<ComShopOrderDO> comShopOrderDOS = orderService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopOrderDO>()
+ .eq(ComShopOrderDO::getStoreId,shopStoreDO.getId()));
+ List<ComShopOrderDO> filterOrder = comShopOrderDOS.stream()
+ .filter(order -> order.getStatus() < ComShopOrderDO.status.dpj)
+ .collect(Collectors.toList());
+ if(!filterOrder.isEmpty()){
+ return R.fail("店铺下还有订单未完成");
+ }
+ //删除商家下的订单
+ comShopOrderDOS.forEach(order->{
+ order.setDeleteStatus(ComShopOrderDO.deleteStatus.yes);
+ orderService.getBaseMapper().updateById(order);
+ });
shopStoreDO.setDeleteStatus(2);
this.baseMapper.updateById(shopStoreDO);
}
--
Gitblit v1.7.1