From 944695ab317bb3899f16b85d4856a3ff91fb27c6 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 3 Apr 2025 14:11:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=BA=E4=BD=8D=EF=BC=8C=E9=80=89=E5=9D=80?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/PointListType.java | 4 +- .../java/com/cool/store/dao/PointInfoDAO.java | 23 ++-- .../com/cool/store/dao/PointTodoInfoDAO.java | 3 +- .../java/com/cool/store/dao/ShopInfoDAO.java | 10 +- .../cool/store/mapper/PointInfoMapper.java | 20 +-- .../store/mapper/PointTodoInfoMapper.java | 3 +- .../com/cool/store/mapper/ShopInfoMapper.java | 4 +- .../main/resources/mapper/PointInfoMapper.xml | 116 +++++++++++------- .../resources/mapper/PointTodoInfoMapper.xml | 2 +- .../main/resources/mapper/ShopInfoMapper.xml | 16 ++- .../com/cool/store/dto/PCPointListDTO.java | 16 +++ .../com/cool/store/entity/PointInfoDO.java | 3 - .../store/request/MiniPointPageRequest.java | 9 -- .../cool/store/request/MiniPointRequest.java | 27 ++++ .../cool/store/vo/point/PointDetailVO.java | 1 - .../com/cool/store/vo/point/PointPageVO.java | 6 +- .../com/cool/store/vo/point/PointToDoVO.java | 5 +- .../com/cool/store/service/PointService.java | 2 + .../com/cool/store/service/ShopService.java | 2 +- .../store/service/impl/PointServiceImpl.java | 58 ++++----- .../store/service/impl/ShopServiceImpl.java | 7 +- .../controller/webc/MiniShopController.java | 11 +- 22 files changed, 220 insertions(+), 128 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/PCPointListDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointRequest.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/PointListType.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/PointListType.java index 3004a187d..750eea4ff 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/PointListType.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/PointListType.java @@ -7,8 +7,8 @@ package com.cool.store.enums; * @注释: */ public enum PointListType { - POINT_LIST_TYPE_1(1, "推荐铺位"), - POINT_LIST_TYPE_2(2, "我创建的"), + RECOMMENDED(1, "推荐铺位"), + MY_POINT_LIST(2, "我创建的"), ; private Integer code; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointInfoDAO.java index fb5bdd7b3..3bb401e8b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointInfoDAO.java @@ -3,13 +3,11 @@ package com.cool.store.dao; import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.cool.store.constants.CommonConstants; import com.cool.store.dto.MiniShopDTO; +import com.cool.store.dto.PCPointListDTO; import com.cool.store.dto.point.LineCountDTO; import com.cool.store.entity.PointInfoDO; import com.cool.store.mapper.PointInfoMapper; -import com.cool.store.request.AllPointPageRequest; -import com.cool.store.request.MiniPointPageRequest; -import com.cool.store.request.PointPageRequest; -import com.cool.store.request.RecommendPointPageRequest; +import com.cool.store.request.*; import com.cool.store.utils.StringUtil; import com.cool.store.vo.point.MiniPointPageVO; import com.cool.store.vo.point.PointHomePageDataVO; @@ -79,9 +77,9 @@ public class PointInfoDAO { * @param request * @return */ - public Page getMyPointPage(PointPageRequest request) { + public Page getMyPointPage(String eid,PointPageRequest request) { PageHelper.startPage(request.getPageNum(), request.getPageSize()); - return pointInfoMapper.getMyPointPage(request); + return pointInfoMapper.getMyPointPage(eid,request); } public Map getSelectedShopNumMap(List lineIds) { @@ -99,11 +97,16 @@ public class PointInfoDAO { return pointInfoMapper.getPointListByIds(pointIds); } - public Page getRecommendPointList(RecommendPointPageRequest request) { + public Page getRecommendPointList(RecommendPointPageRequest request) { PageHelper.startPage(request.getPageNum(), request.getPageSize()); return pointInfoMapper.getRecommendPointList(request); } + public List getRecommendOrMyList(MiniPointRequest request) { + PageHelper.startPage(request.getPageNum(), request.getPageSize()); + return pointInfoMapper.getRecommendOrMyList(request); + } + public Integer updateSelectedDevelopmentManager(Long shopId, String developmentManager) { if(Objects.isNull(shopId) || StringUtils.isBlank(developmentManager)){ return null; @@ -111,9 +114,9 @@ public class PointInfoDAO { return pointInfoMapper.updateSelectedDevelopmentManager(shopId, developmentManager); } - public Page getTeamPointPage(AllPointPageRequest request) { + public Page getTeamPointPage(String eid,AllPointPageRequest request) { PageHelper.startPage(request.getPageNum(), request.getPageSize()); - return pointInfoMapper.getTeamPointPage(request); + return pointInfoMapper.getTeamPointPage(eid,request); } public Integer recyclePoint(Long pointId) { @@ -123,7 +126,7 @@ public class PointInfoDAO { return pointInfoMapper.recyclePoint(pointId); } - public List getMiniPointPage(String eid,MiniPointPageRequest request ) { + public List getMiniPointPage(String eid,MiniPointRequest request ) { List pointInfoDOPage = pointInfoMapper.MiniPointPageVO(eid,request); if(CollectionUtils.isEmpty(pointInfoDOPage)){ return Lists.newArrayList(); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java index 1e95ba285..3b07feddd 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java @@ -1,5 +1,6 @@ package com.cool.store.dao; +import com.cool.store.dto.PCPointListDTO; import com.cool.store.entity.PointAuditRecordDO; import com.cool.store.entity.PointInfoDO; import com.cool.store.entity.PointTodoInfoDO; @@ -53,7 +54,7 @@ public class PointTodoInfoDAO { return pointTodoInfoMapper.getPointToDoByUserIdAndPointId(userId, pointId); } - public Page getUserTodoList(PointTodoPageRequest request) { + public Page getUserTodoList(PointTodoPageRequest request) { PageHelper.startPage(request.getPageNum(), request.getPageSize()); return pointTodoInfoMapper.getUserTodoList(request); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index 7123e6a93..b00f2cc2e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -229,7 +229,13 @@ public class ShopInfoDAO { } return shopInfoMapper.selectByLines(lineIds,regionIds); } - public List getShopListAndStatusIsOverByLineId(Long lineId){ - return shopInfoMapper.getShopListAndStatusIsOverByLineId(lineId); + public List getShopListSuccessOpen(String eid,Long lineId){ + return shopInfoMapper.getShopListSuccessOpen(eid,lineId); + } + public String getOpenName(String eid,Long shopId){ + if (shopId == null){ + return null; + } + return shopInfoMapper.getOpenName(eid,shopId); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointInfoMapper.java index a614fd133..2d2f52a4d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointInfoMapper.java @@ -1,12 +1,10 @@ package com.cool.store.mapper; import com.cool.store.dto.MiniShopDTO; +import com.cool.store.dto.PCPointListDTO; import com.cool.store.dto.point.LineCountDTO; import com.cool.store.entity.PointInfoDO; -import com.cool.store.request.AllPointPageRequest; -import com.cool.store.request.MiniPointPageRequest; -import com.cool.store.request.PointPageRequest; -import com.cool.store.request.RecommendPointPageRequest; +import com.cool.store.request.*; import com.cool.store.vo.point.MiniPointPageVO; import com.cool.store.vo.point.PointHomePageDataVO; import com.cool.store.vo.point.PointPageVO; @@ -31,7 +29,7 @@ public interface PointInfoMapper extends Mapper { * @param request * @return */ - Page getMyPointPage(@Param("request") PointPageRequest request); + Page getMyPointPage(@Param("eid") String eid,@Param("request") PointPageRequest request); /** * 获取线索选择门店数 @@ -52,7 +50,7 @@ public interface PointInfoMapper extends Mapper { * @param request * @return */ - Page getRecommendPointList(@Param("request") RecommendPointPageRequest request); + Page getRecommendPointList(@Param("request") RecommendPointPageRequest request); /** * 更新铺位的拓展经理 @@ -67,7 +65,7 @@ public interface PointInfoMapper extends Mapper { * @param request * @return */ - Page getTeamPointPage(@Param("request") AllPointPageRequest request); + Page getTeamPointPage(@Param("eid")String eid,@Param("request") AllPointPageRequest request); /** * 回收铺位 @@ -97,7 +95,7 @@ public interface PointInfoMapper extends Mapper { * @Date: 2025/3/31 * @description:获取铺位部分数据 */ - List MiniPointPageVO(@Param("enterpriseId") String enterpriseId , @Param("request") MiniPointPageRequest request); + List MiniPointPageVO(@Param("enterpriseId") String enterpriseId , @Param("request") MiniPointRequest request); /** * @Auther: wangshuo @@ -112,4 +110,10 @@ public interface PointInfoMapper extends Mapper { * @description:根据机会点code获取门店信息 */ List getShopByOpportunityPointCode(@Param("enterpriseId") String enterpriseId, @Param("code") String code); + /** + * @Auther: wangshuo + * @Date: 2025/4/3 + * @description:获取全部可推荐铺位 + */ + List getRecommendOrMyList(@Param("request") MiniPointRequest request); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java index 438aed108..6d330cf2a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java @@ -1,5 +1,6 @@ package com.cool.store.mapper; +import com.cool.store.dto.PCPointListDTO; import com.cool.store.entity.PointAuditRecordDO; import com.cool.store.entity.PointInfoDO; import com.cool.store.entity.PointTodoInfoDO; @@ -56,7 +57,7 @@ public interface PointTodoInfoMapper extends Mapper { * @param request * @return */ - Page getUserTodoList(@Param("request") PointTodoPageRequest request); + Page getUserTodoList(@Param("request") PointTodoPageRequest request); /** * 获取当前节点 diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index 1206c7f67..e6e4b26f2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -123,5 +123,7 @@ public interface ShopInfoMapper extends Mapper { List getShopIdByShopStatus(@Param("shopStatus") Integer shopStatus); - List getShopListAndStatusIsOverByLineId(Long lineId); + List getShopListSuccessOpen(@Param("eid") String eid,@Param("lineId") Long lineId); + + String getOpenName(@Param("eid") String eid,@Param("shopId")Long shopId); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml index 36d890556..870d6a801 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml @@ -30,7 +30,6 @@ - @@ -41,7 +40,7 @@ development_manager, operate_user_id, development_time, point_status, point_score, select_status, submit_audit_count, point_source, deleted, create_time, update_time, - province, city, district, township, opportunity_point_code, opportunity_point_name,open_shop_name, + province, city, district, township, opportunity_point_code, opportunity_point_name, province_code, city_code, district_code @@ -56,26 +55,28 @@ from xfsg_point_info where deleted = 0 and development_manager = #{userId} - select - id, - point_name, - point_code, - address, - region_id, - point_status, - point_score, - point_area, - development_manager, - operate_user_id, - development_time, - select_status, - create_time, - update_time, - open_shop_name, - opportunity_point_code, - opportunity_point_name - from xfsg_point_info + a.id, + a.point_name, + a.point_code, + a.address, + a.region_id, + a.point_status, + a.point_score, + a.point_area, + a.development_manager, + a.operate_user_id, + a.development_time, + a.select_status, + a.create_time, + a.update_time, + a.opportunity_point_code, + a.opportunity_point_name, + c.store_name as openName + from xfsg_point_info a + left join xfsg_shop_info b on a.shop_id = b.id + left join store_${eid} c on b.shop_code = c.store_num where deleted = 0 and development_manager = #{request.developmentManager} and (point_code like concat('%', #{request.keyword}, '%') or point_name like concat('%', #{request.keyword}, @@ -136,7 +137,7 @@ #{pointId} - select from xfsg_point_info @@ -159,27 +160,28 @@ shop_id = #{shopId} and select_status = '1' and deleted = 0 - select - id, - point_name, - point_code, - address, - region_id, - point_status, - point_score, - point_area, - development_manager, - operate_user_id, - development_time, - select_status, - create_time, - update_time, - open_shop_name, - opportunity_point_code, - opportunity_point_name - from - xfsg_point_info + a.id, + a.point_name, + a.point_code, + a.address, + a.region_id, + a.point_status, + a.point_score, + a.point_area, + a.development_manager, + a.operate_user_id, + a.development_time, + a.select_status, + a.create_time, + a.update_time, + a.opportunity_point_code, + a.opportunity_point_name, + c.store_name as openName + from xfsg_point_info a + left join xfsg_shop_info b on a.shop_id = b.id + left join store_${eid} c on b.shop_code = c.store_num where deleted = 0 and point_status in (4,5,6,7) and (point_code like concat('%', #{request.keyword}, '%') or point_name like concat('%', #{request.keyword}, @@ -244,6 +246,7 @@ left JOIN xfsg_shop_info b ON a.shop_id = b.id LEFT JOIN xfsg_point_detail_info c on a.id = c.point_id left JOIN store_${enterpriseId} d ON b.shop_code = d.store_num + where a.deleted = 0 and (a.province_code = #{request.areaCode} or a.city_code = #{request.areaCode} or a.district_code = #{request.areaCode}) @@ -275,6 +278,35 @@ inner join store_${enterpriseId} c on b.shop_code = c.store_num where a.opportunity_point_code = #{code} + update xfsg_point_info set line_id = null, shop_id = null, select_status = 0, update_time = now(), point_status diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml index aedfa9796..3d52a64c8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml @@ -69,7 +69,7 @@ update xfsg_point_todo_info set status = if(handler_user_id = #{handlerUserId}, 1, 2), update_time = now() where point_id = #{pointId} and node_no = #{nodeNo} and cycle_count = #{cycleCount} and deleted = 0 - select b.id, b.point_name, diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 3463ecefe..83f9e87c7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -412,10 +412,18 @@ from xfsg_shop_info where shop_status = #{shopStatus} - + select a.shop_name as shopName, + a.id as shopId + from xfsg_shop_info a + inner join store_${eid} c on a.shop_code = c.store_num + where a.line_id = #{lineId} + + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/PCPointListDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/PCPointListDTO.java new file mode 100644 index 000000000..1a2555f3a --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/PCPointListDTO.java @@ -0,0 +1,16 @@ +package com.cool.store.dto; + +import com.cool.store.entity.PointInfoDO; +import lombok.Data; + +/** + * @Author: WangShuo + * @Date: 2025/04/03/11:17 + * @Version 1.0 + * @注释: + */ +@Data +public class PCPointListDTO extends PointInfoDO { + + private String openName; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointInfoDO.java index 2d69b0d6d..2c765c3c0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointInfoDO.java @@ -161,9 +161,6 @@ public class PointInfoDO { @Column(name = "opportunity_point_name") private String opportunityPointName; - @Column(name = "open_shop_name") - private String openShopName; - @Column(name = "province_code") private String provinceCode; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointPageRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointPageRequest.java index 7c47e3bd0..d977ad575 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointPageRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointPageRequest.java @@ -25,14 +25,5 @@ public class MiniPointPageRequest extends PageBasicInfo { @ApiModelProperty(value = "门店线索ID") private Long shopId; - @ApiModelProperty(value = "1-推荐铺位,2-我创建的") - @NotNull - private Integer type; - private Long lineId; - - private String partnerId; - - @ApiModelProperty("省市区编码,传最后一级") - private String areaCode; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointRequest.java new file mode 100644 index 000000000..d7b3aa576 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointRequest.java @@ -0,0 +1,27 @@ +package com.cool.store.request; + +import com.cool.store.common.PageBasicInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author: WangShuo + * @Date: 2025/04/03/09:52 + * @Version 1.0 + * @注释: + */ +@Data +public class MiniPointRequest extends PageBasicInfo { + @ApiModelProperty(value = "1-推荐铺位,2-我创建的") + @NotNull + private Integer type; + + private Long lineId; + + private String partnerId; + + @ApiModelProperty("省市区编码,传最后一级") + private String areaCode; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java index d2d736b2a..239d906f3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java @@ -352,7 +352,6 @@ public class PointDetailVO { result.setCity(pointInfo.getCity()); result.setDistrict(pointInfo.getDistrict()); result.setTownship(pointInfo.getTownship()); - result.setOpenShopName(pointInfo.getOpenShopName()); result.setOpportunityPointCode(pointInfo.getOpportunityPointCode()); result.setOpportunityPointName(pointInfo.getOpportunityPointName()); return result; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java index 068212ff2..9dc7ebb36 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java @@ -1,5 +1,6 @@ package com.cool.store.vo.point; +import com.cool.store.dto.PCPointListDTO; import com.cool.store.entity.PointInfoDO; import com.cool.store.enums.point.PointStatusEnum; import com.google.common.collect.Lists; @@ -66,12 +67,12 @@ public class PointPageVO { private String opportunityPointName; - public static List convertVO(List pointList, Map usernameMap, Map regionNameMap) { + public static List convertVO(List pointList, Map usernameMap, Map regionNameMap) { if(CollectionUtils.isEmpty(pointList)){ return Lists.newArrayList(); } List resultList = new ArrayList<>(); - for (PointInfoDO pointInfo : pointList) { + for (PCPointListDTO pointInfo : pointList) { PointPageVO pointPageVO = new PointPageVO(); pointPageVO.setPointId(pointInfo.getId()); pointPageVO.setPointName(pointInfo.getPointName()); @@ -90,6 +91,7 @@ public class PointPageVO { pointPageVO.setAddress(pointInfo.getAddress()); pointPageVO.setCreateTime(pointInfo.getCreateTime()); pointPageVO.setUpdateTime(pointInfo.getUpdateTime()); + pointPageVO.setOpenShopName(pointInfo.getOpenName()); resultList.add(pointPageVO); } return resultList; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointToDoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointToDoVO.java index eaa230e48..d5f204bf4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointToDoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointToDoVO.java @@ -1,5 +1,6 @@ package com.cool.store.vo.point; +import com.cool.store.dto.PCPointListDTO; import com.cool.store.entity.PointInfoDO; import com.cool.store.enums.point.PointStatusEnum; import com.google.common.collect.Lists; @@ -36,12 +37,12 @@ public class PointToDoVO { @ApiModelProperty("提交时间") private Date submitTime; - public static List convertVO(List pointList, Map regionNameMap, Map submitTimeMap) { + public static List convertVO(List pointList, Map regionNameMap, Map submitTimeMap) { if(CollectionUtils.isEmpty(pointList)){ return Lists.newArrayList(); } List resultList = new ArrayList<>(); - for (PointInfoDO pointInfo : pointList) { + for (PCPointListDTO pointInfo : pointList) { PointToDoVO pointPageVO = new PointToDoVO(); pointPageVO.setPointId(pointInfo.getId()); pointPageVO.setPointName(pointInfo.getPointName()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java index a73a2a17a..b344eda67 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java @@ -302,4 +302,6 @@ public interface PointService { * @return */ Boolean linePointToShopPoint(Long lineId); + + PageInfo getRecommendedOrMyPointList(MiniPointRequest request); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java index 913bea7f9..f333746cb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java @@ -105,5 +105,5 @@ public interface ShopService { Boolean dataHandler(Long shopId); - List getShopListAndStatusIsOverByLineId(Long lineId); + List getShopListSuccessOpen(Long lineId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 28f53bb51..98d533d2e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; +import com.cool.store.dto.PCPointListDTO; import com.cool.store.dto.point.AuditNodeDTO; import com.cool.store.dto.point.MiniPointPageDTO; import com.cool.store.dto.point.ShopPointDTO; @@ -139,8 +140,10 @@ public class PointServiceImpl implements PointService { log.error("铺位详情信息不存在"); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); } + String openName = shopInfoDAO.getOpenName(enterpriseId, pointInfo.getShopId()); String userName = enterpriseUserDAO.getUserName(pointInfo.getDevelopmentManager()); PointDetailVO result = PointDetailVO.convertVO(pointInfo, pointDetailInfo); + result.setOpenShopName(openName); result.setDevelopmentManagerUserName(userName); result.setDevelopmentManagerUserId(pointInfo.getDevelopmentManager()); result.setRegionNodeName(regionService.getBelongWarRegionName(pointInfo.getRegionId())); @@ -176,7 +179,7 @@ public class PointServiceImpl implements PointService { request1.setUserId(user.getUserId()); request1.setMobile(user.getMobile()); request1.setUserName(user.getName()); - }else{ + } else { request1.setUserId(lineInfoDO.getPartnerId()); request1.setMobile(lineInfoDO.getMobile()); request1.setUserName(lineInfoDO.getUsername()); @@ -554,7 +557,7 @@ public class PointServiceImpl implements PointService { } } List resultList = new ArrayList(); - Page pointPage = pointInfoDAO.getMyPointPage(request); + Page pointPage = pointInfoDAO.getMyPointPage(enterpriseId,request); if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) { List regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); @@ -583,7 +586,7 @@ public class PointServiceImpl implements PointService { request.setPointStatus(PointStatusEnum.POINT_STATUS_4.getCode()); } List resultList = new ArrayList(); - Page pointPage = pointInfoDAO.getTeamPointPage(request); + Page pointPage = pointInfoDAO.getTeamPointPage( enterpriseId,request); if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) { List regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); @@ -638,7 +641,7 @@ public class PointServiceImpl implements PointService { @Override public PageInfo getRecommendPointList(RecommendPointPageRequest request) { List resultList = new ArrayList(); - Page pointPage = pointInfoDAO.getRecommendPointList(request); + Page pointPage = pointInfoDAO.getRecommendPointList(request); if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) { List regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); @@ -751,7 +754,7 @@ public class PointServiceImpl implements PointService { @Override public PageInfo getTodoList(PointTodoPageRequest request) { - Page pointPage = pointTodoInfoDAO.getUserTodoList(request); + Page pointPage = pointTodoInfoDAO.getUserTodoList(request); List resultList = new ArrayList<>(); if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) { List regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); @@ -767,33 +770,16 @@ public class PointServiceImpl implements PointService { @Override public PageInfo getLineRecommendPointPage(MiniPointPageRequest request) { - //todo - if (Objects.equals(request.getType(), PointListType.POINT_LIST_TYPE_1.getCode())) { - Page pointPage = pointRecommendDAO.getLineRecommendPointPage(request); - List resultList = new ArrayList<>(); - if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) { - List regionIds = pointPage.getResult().stream().map(MiniPointPageDTO::getRegionId).distinct().collect(Collectors.toList()); - Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); - resultList = MiniPointPageVO.convertVO(pointPage, regionNameMap); - List pointList = pointPage.getResult().stream().map(MiniPointPageDTO::getPointId).distinct().collect(Collectors.toList()); - List pointDetailList = pointDetailInfoDAO.getByPointIdList(pointList); - Map map = pointDetailList.stream().collect(Collectors.toMap(PointDetailInfoDO::getPointId, Function.identity())); - resultList.forEach(x -> { - PointDetailInfoDO pointDetailInfoDO = map.getOrDefault(x.getPointId(), new PointDetailInfoDO()); - x.setMonthRent(pointDetailInfoDO.getMonthRent()); - x.setLandlordMobile(pointDetailInfoDO.getLandlordMobile()); - }); - } - PageInfo resultPage = new PageInfo(pointPage); - resultPage.setList(resultList); - return resultPage; + Page pointPage = pointRecommendDAO.getLineRecommendPointPage(request); + List resultList = new ArrayList<>(); + if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) { + List regionIds = pointPage.getResult().stream().map(MiniPointPageDTO::getRegionId).distinct().collect(Collectors.toList()); + Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); + resultList = MiniPointPageVO.convertVO(pointPage, regionNameMap); } - if (request.getType().equals(PointListType.POINT_LIST_TYPE_2.getCode())) { - PageHelper.startPage(request.getPageNum(), request.getPageSize()); - List miniPointPage = pointInfoDAO.getMiniPointPage(enterpriseId,request); - return new PageInfo<>(miniPointPage); - } - return new PageInfo<>(); + PageInfo resultPage = new PageInfo(pointPage); + resultPage.setList(resultList); + return resultPage; } @Override @@ -1096,7 +1082,7 @@ public class PointServiceImpl implements PointService { request.setDevelopmentManager(userId); request.setPageNum(pageNumber); request.setPageSize(pageSize); - Page pointPage = pointTodoInfoDAO.getUserTodoList(request); + Page pointPage = pointTodoInfoDAO.getUserTodoList(request); List resultList = new ArrayList<>(); if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) { List regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); @@ -1194,6 +1180,14 @@ public class PointServiceImpl implements PointService { return Boolean.TRUE; } + @Override + public PageInfo getRecommendedOrMyPointList(MiniPointRequest request) { + PageHelper.startPage(request.getPageNum(), request.getPageSize()); + List pointPage = pointInfoDAO.getRecommendOrMyList(request); + return new PageInfo<>(pointPage); + + } + public List dealAuditNode(AuditSettingVO auditSetting, Long regionId, String developmentManager) { List roleIds = new ArrayList<>(); //审核人 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 2c2e52ddd..5dcfe5aff 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -32,6 +32,7 @@ import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,6 +53,8 @@ import static com.cool.store.enums.ErrorCodeEnum.UPDATE_INVESTMENT_MANAGER_FAIL; @Service @Slf4j public class ShopServiceImpl implements ShopService { + @Value("${mybatis.configuration.variables.enterpriseId}") + private String eid; @Resource private SysRoleService sysRoleService; @Resource @@ -557,8 +560,8 @@ public class ShopServiceImpl implements ShopService { } @Override - public List getShopListAndStatusIsOverByLineId(Long lineId) { - return shopInfoDAO.getShopListAndStatusIsOverByLineId(lineId); + public List getShopListSuccessOpen(Long lineId) { + return shopInfoDAO.getShopListSuccessOpen(eid,lineId); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java index da7c23365..a38178719 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java @@ -61,9 +61,6 @@ public class MiniShopController { @ApiOperation("获取推荐给我的铺位") @PostMapping("/getLineRecommendPointPage") public ResponseResult> getLineRecommendPointPage(@RequestBody MiniPointPageRequest request) { - PartnerUserInfoVO user = PartnerUserHolder.getUser(); - request.setPartnerId(user.getPartnerId()); - request.setLineId(user.getLineId()); return ResponseResult.success(pointService.getLineRecommendPointPage(request)); } @@ -119,7 +116,13 @@ public class MiniShopController { @ApiOperation("获取状态为完成的门店列表") @GetMapping("/getStatusOver") public ResponseResult> getShopListAndStatusIsOverByLineId(@RequestParam("lineId")Long lineId) { - return ResponseResult.success(shopService.getShopListAndStatusIsOverByLineId(lineId)); + return ResponseResult.success(shopService.getShopListSuccessOpen(lineId)); } + @ApiOperation("获取状态为完成的门店列表") + @GetMapping("/getRecommendedOrMyPointList") + public ResponseResult> getRecommendedOrMyPointList(@RequestParam("request")MiniPointRequest request) { + request.setLineId(PartnerUserHolder.getUser().getLineId()); + return ResponseResult.success(pointService.getRecommendedOrMyPointList( request)); + } }