springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java
@@ -91,7 +91,7 @@ @ApiOperation(value = "查询便民服务商家详情") @GetMapping("/business/get") public R getComCvtBusiness(@RequestParam("id") Long id) { return communityService.getComCvtBusiness(id, null); return communityService.getComCvtBusiness(id); }
@@ -29,6 +29,6 @@ private Date payTimeEnd; @ApiModelProperty(value = "订单ID-如果指定了订单ID，只导出指定订单，其它搜索条件将被忽略", notes = "如果指定了订单ID，其它搜索条件将被忽略，只导出指定订单") private Long[] orderIds; @JsonIgnore @ApiModelProperty(hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java
@@ -38,7 +38,7 @@ @ApiModelProperty("店铺登陆账号") @Pattern(groups = {AddGroup.class}, message="【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$") //@Pattern(groups = {AddGroup.class}, message="【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$") @NotBlank(message = "店铺登陆账号不能为空") private String storeAccount;
@@ -1218,7 +1218,7 @@ * @return 返回结果 */ @GetMapping("/convenient/business/get") R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode); R getComCvtBusiness(@RequestParam("id") Long id); /** * 删除便民服务商家信息 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java
@@ -107,8 +107,7 @@ @ApiOperation(value = "查询便民服务商家详情") @GetMapping("/business/get") public R getComCvtBusiness(@RequestParam("id") Long id) { String cityCode = "510400"; return communityService.getComCvtBusiness(id, cityCode); return communityService.getComCvtBusiness(id); } @ApiOperation(value = "删除便民服务商家详情") springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -593,10 +593,10 @@ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO(); sysUserNoticeVO.setUserId(userId); sysUserNoticeVO.setType(3); sysUserNoticeVO.setTitle("党员认证申请被驳回"); sysUserNoticeVO.setTitle("党员认证申请未通过"); sysUserNoticeVO.setBusinessType(11); sysUserNoticeVO.setBusinessTitle(" "); sysUserNoticeVO.setBusinessContent("你提交的党员认证申请已被驳回"); sysUserNoticeVO.setBusinessContent("驳回原因：" + partyBuildingMemberVO.getRefuseReason()); sysUserNoticeVO.setBusinessId(memId); sysUserNoticeVO.setStatus(0); sysUserNoticeVO.setBusinessStatus(1); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -84,12 +84,11 @@ * 查询便民服务商家详情 * * @param id 商家主键 * @param cityCode 城市编码 * @return 返回结果 */ @GetMapping("/business/get") public R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode) { return comCvtBusinessService.getComCvtBusiness(id, cityCode); public R getComCvtBusiness(@RequestParam("id") Long id) { return comCvtBusinessService.getComCvtBusiness(id); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtBusinessService.java
@@ -37,10 +37,9 @@ /** * 查询便民服务商家详情 * @param id 商家主键 * @param cityCode 城市编码 * @return */ R getComCvtBusiness(Long id, String cityCode); R getComCvtBusiness(Long id); /** * 删除便民服务商家信息 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -166,7 +166,9 @@ */ @Override public R listCommunityAll() { List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0).orderByDesc(ComActDO::getCreateAt)); List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0) .eq(ComActDO::getCityCode, "510400") .orderByDesc(ComActDO::getCreateAt)); List<ComActVO> comActVOS = new ArrayList<>(); if (!ObjectUtils.isEmpty(comActDOS)) { comActDOS.forEach(comActDO -> { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java
@@ -146,7 +146,7 @@ } @Override public R getComCvtBusiness(Long id, String cityCode) { public R getComCvtBusiness(Long id) { ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(id); if (null == comCvtBusinessDO) { return R.fail("商家不存在"); @@ -157,18 +157,11 @@ if(comCvtBusinessDO.getAreaFlag()==1){ LambdaQueryWrapper<ComActDO> lambdaQueryWrapper = new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState,0); if(!StringUtils.isEmpty(cityCode)){ lambdaQueryWrapper.eq(ComActDO::getCityCode, cityCode); } comActDOS = comActDAO.selectList(lambdaQueryWrapper); }else{ List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId()); if(!ObjectUtils.isEmpty(areaIds)){ List<ComActDO> busiDO = comActDAO.selectBatchIds(areaIds); if(!StringUtils.isEmpty(cityCode) && busiDO!=null && busiDO.size()>0){ comActDOS = busiDO.stream().filter(comActDO -> cityCode.equals(comActDO.getCityCode())) .collect(Collectors.toList()); } } }
@@ -5,15 +5,19 @@ import com.panzhihua.common.model.dtos.partybuilding.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.service_dangjian.dao.ComPbOrgDAO; import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO; import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO; import com.panzhihua.service_dangjian.service.ComBpActivityService; import com.panzhihua.service_dangjian.service.ComPbMemberService; import com.panzhihua.service_dangjian.service.ComPbServiceTeamService; import com.panzhihua.service_dangjian.service.PartyOrganizationService; import org.springframework.beans.BeanUtils; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; /** @@ -33,6 +37,8 @@ private ComBpActivityService comBpActivityService; @Resource private ComPbServiceTeamService comPbServiceTeamService; @Resource private ComPbOrgDAO comPbOrgDAO; /** * 社区所有启用的党组织列表 @@ -513,7 +519,15 @@ @GetMapping("usercertification") R userCertification(@RequestParam("id")Long id){ List<ComPbMemberDO> comPbMemberDOList = comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id)); return R.ok(comPbMemberDOList); List<PartyBuildingMemberVO> partyBuildingMemberVOList = new ArrayList<>(); comPbMemberDOList.forEach(comPbMemberDO -> { PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO(); BeanUtils.copyProperties(comPbMemberDO, partyBuildingMemberVO); ComPbOrgDO comPbOrgDO = comPbOrgDAO.selectById(partyBuildingMemberVO.getOrgId()); partyBuildingMemberVO.setOrgName(comPbOrgDO.getName()); partyBuildingMemberVOList.add(partyBuildingMemberVO); }); return R.ok(partyBuildingMemberVOList); }
@@ -348,6 +348,11 @@ @Override public R updateYnamic(PartyBuildingComPbDynVO partyCommitteeVO) { ComPbDynDO comPbDynDO=new ComPbDynDO(); if(partyCommitteeVO.getPublishAt()!=null && partyCommitteeVO.getPublishAt().getTime() >System.currentTimeMillis()){ partyCommitteeVO.setStatus(1); }else if(partyCommitteeVO.getPublishAt()!=null && partyCommitteeVO.getPublishAt().getTime() < System.currentTimeMillis()){ partyCommitteeVO.setStatus(2); } BeanUtils.copyProperties(partyCommitteeVO,comPbDynDO); int insert = comPbDynDAO.updateById(comPbDynDO); if (insert>0) {
