springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
@@ -42,18 +42,16 @@ pageQuestnaireDTO.setForParty(1 == isPartymember.intValue()); pageQuestnaireDTO.setForVolunteer(1 == isVolunteer.intValue()); pageQuestnaireDTO.setUserId(loginUserInfo.getUserId()); // pageQuestnaireDTO.setState(0); return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId()); } @ApiOperation(value = "分页查询社区调查问卷", response = QuestnaireListVo.class) @PostMapping("/pageVolunteer") public R pageVolunteer(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); pageQuestnaireDTO.setForMasses(null); pageQuestnaireDTO.setForVolunteer(true); pageQuestnaireDTO.setForParty(true); return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId()); return communityService.pageQuestnaire(pageQuestnaireDTO, getLoginUserInfo().getCommunityId()); } @ApiOperation(value = "创建调查问卷") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
@@ -67,7 +67,7 @@ private Long receiverId; /** * 删除状态(1.未删除 2.已删除) * 是否已删除（1.是 2.否） */ private Integer deleteStatus;
@@ -156,19 +156,33 @@ } //查询默认收货地址 //查询上次购买记录的收货地址 List<ComShopOrderDO> shopOrders = this.baseMapper.selectList(new QueryWrapper<ComShopOrderDO>() .eq("user_id",orderPreviewDTO.getUserId()).orderByDesc("create_at")); if(shopOrders.isEmpty()){//未查询到用户上一笔订单 //查询用户收货地址中的默认地址 ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectOne(new QueryWrapper<ComShopUserAddressDO>() ComShopUserAddressDO userDefaultAddressDO = comShopUserAddressDAO.selectOne(new QueryWrapper<ComShopUserAddressDO>() .eq("delete_status", 2) .eq("user_id",orderPreviewDTO.getUserId()).eq("is_default",ComShopUserAddressDO.isDefault.yes)); //查询用户收货地址中的默认地址 if(userDefaultAddressDO != null){ ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO(); BeanUtils.copyProperties(userDefaultAddressDO,userAddressVO); orderPreviewVO.setUserAddressVO(userAddressVO); }else{ //查询上次购买记录的收货地址 //查询到用户上一笔订单 List<ComShopOrderDO> shopOrders = this.baseMapper.selectList(new QueryWrapper<ComShopOrderDO>() .eq("delete_status", 2) .eq("user_id",orderPreviewDTO.getUserId()).eq("is_default",ComShopUserAddressDO.isDefault.yes)); if(userAddressDO != null){ ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO(); BeanUtils.copyProperties(userAddressDO,userAddressVO); orderPreviewVO.setUserAddressVO(userAddressVO); }else{ .eq("user_id",orderPreviewDTO.getUserId()) .orderByDesc("create_at")); if(shopOrders!=null && shopOrders.size()>0) { ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId()); if (userAddressDO != null) { ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO(); BeanUtils.copyProperties(userAddressDO, userAddressVO); orderPreviewVO.setUserAddressVO(userAddressVO); } } //无默认地址， 无上一单记录 地址 /* if(orderPreviewVO.getUserAddressVO()==null){ List<ComShopUserAddressDO> userAddressDOList = comShopUserAddressDAO.selectList(new QueryWrapper<ComShopUserAddressDO>() .eq("user_id",orderPreviewDTO.getUserId()).orderByDesc("create_at")); if(!userAddressDOList.isEmpty()){ @@ -177,16 +191,10 @@ orderPreviewVO.setUserAddressVO(userAddressVO); } } }else{//查询到用户上一笔订单 ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId()); if(userAddressDO != null){ if(userAddressDO.getDeleteStatus() == 2) { ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO(); BeanUtils.copyProperties(userAddressDO, userAddressVO); orderPreviewVO.setUserAddressVO(userAddressVO); } } */ } return R.ok(orderPreviewVO); }
@@ -94,7 +94,8 @@ public R shopStoreDetail(PageComShopStoreDTO comShopStoreDTO) { //查询店铺 ComShopStoreDO storeDO = this.baseMapper.selectById(comShopStoreDTO.getStoreId()); if (storeDO == null) { boolean storeDeleted = storeDO!=null && 2==storeDO.getDeleteStatus(); if (storeDO == null || storeDeleted) { return R.fail(401, "店铺不存在"); } if (storeDO.getStatus().equals(ComShopStoreDO.status.no)) { springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.constants.UserConstants; import com.panzhihua.common.exceptions.PartyBuildingMemberException; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActivityVO; @@ -469,6 +470,9 @@ if (delete>0) { // 维护用户表党员状态 comPbMemberDAO.updateUserIsPartymember(comPbMemberDO.getIdCard()); //删除缓存 String userKey = UserConstants.LOGIN_USER_INFO + comPbMemberDO.getUserId(); stringRedisTemplate.delete(userKey); return R.ok(); } return R.fail(); springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
@@ -82,9 +82,6 @@ - POST:/api/applets/partybuilding/activityinfo - PUT:/api/applets/user/microwishconfirm - POST:/api/applets/user/pagemicrowish - POST:/api/applets/index/pageeasyphoto - POST:/api/applets/user/pageeasyphoto - POST:/api/applets/neighbor/user/page - POST:/api/applets/pagehouse - GET:/api/applets/user/listfamily - POST:/api/applets/pagediscuss - GET:/api/applets/user/listfamily
