diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/OpTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/OpTypeEnum.java new file mode 100644 index 000000000..8b6ff08fd --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/OpTypeEnum.java @@ -0,0 +1,38 @@ +package com.cool.store.enums; + +/** + * @Author: WangShuo + * @Date: 2025/04/02/16:44 + * @Version 1.0 + * @注释: + */ +public enum OpTypeEnum { + //操作类型: 1(新增), 2(更新), 3(删除) + INSERT(1, "新增"), + UPDATE(2, "更新"), + DELETE(3, "删除"); + + private Integer code; + private String name; + + OpTypeEnum(Integer code, String name) { + this.code = code; + this.name = name; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} 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/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java index 1b1501c47..862ad38bd 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java @@ -1,9 +1,11 @@ package com.cool.store.dao; import com.cool.store.constants.CommonConstants; +import com.cool.store.dto.UserDTO; import com.cool.store.dto.openPreparation.UserNameDTO; import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.mapper.EnterpriseUserMapper; +import com.cool.store.response.oppty.UserResponse; import com.cool.store.utils.StringUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; @@ -153,4 +155,7 @@ public class EnterpriseUserDAO { } return enterpriseUserMapper.getUserListByRegionId(regionId); } + public List getAllUser(String eid, String keyword){ + return enterpriseUserMapper.getAllUser(eid,keyword); + } } \ No newline at end of file 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 0ec63e783..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 @@ -2,13 +2,12 @@ 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; @@ -18,8 +17,10 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; +import tk.mybatis.mapper.entity.Example; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -76,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) { @@ -96,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; @@ -108,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) { @@ -120,12 +126,26 @@ public class PointInfoDAO { return pointInfoMapper.recyclePoint(pointId); } - public List getMiniPointPage(MiniPointPageRequest request ) { - List pointInfoDOPage = pointInfoMapper.MiniPointPageVO(request); + public List getMiniPointPage(String eid,MiniPointRequest request ) { + List pointInfoDOPage = pointInfoMapper.MiniPointPageVO(eid,request); if(CollectionUtils.isEmpty(pointInfoDOPage)){ return Lists.newArrayList(); } return pointInfoDOPage ; } + + public List getPointByOpportunityPointCode(String code){ + if (StringUtils.isBlank(code)){ + return new ArrayList<>(); + } + return pointInfoMapper.getPointByOpportunityPointCode(code); + } + + public List getShopByOpportunityPointCode(String eid,String code){ + if (StringUtils.isBlank(code)){ + return new ArrayList<>(); + } + return pointInfoMapper.getShopByOpportunityPointCode(eid,code); + } } 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/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java index fa6c9ec69..965ca18d3 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java @@ -1,5 +1,6 @@ package com.cool.store.mapper; +import com.cool.store.dto.UserDTO; import com.cool.store.dto.openPreparation.UserNameDTO; import com.cool.store.entity.EnterpriseUserDO; import org.apache.ibatis.annotations.Mapper; @@ -89,4 +90,5 @@ public interface EnterpriseUserMapper { */ List getUserListByRegionId( @Param("regionId") Long regionId); + List getAllUser(@Param("eid")String id, @Param("keyword") String keyword); } \ No newline at end of file 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 884112e28..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,11 +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; @@ -30,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); /** * 获取线索选择门店数 @@ -51,7 +50,7 @@ public interface PointInfoMapper extends Mapper { * @param request * @return */ - Page getRecommendPointList(@Param("request") RecommendPointPageRequest request); + Page getRecommendPointList(@Param("request") RecommendPointPageRequest request); /** * 更新铺位的拓展经理 @@ -66,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); /** * 回收铺位 @@ -96,5 +95,25 @@ public interface PointInfoMapper extends Mapper { * @Date: 2025/3/31 * @description:获取铺位部分数据 */ - List MiniPointPageVO(@Param("request") MiniPointPageRequest request); + List MiniPointPageVO(@Param("enterpriseId") String enterpriseId , @Param("request") MiniPointRequest request); + + /** + * @Auther: wangshuo + * @Date: 2025/4/2 + * @description:根据机会点code获取铺位信息 + */ + List getPointByOpportunityPointCode(@Param("code") String code); + + /** + * @Auther: wangshuo + * @Date: 2025/4/2 + * @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/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index 349a94f84..5ef66649c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -169,4 +169,14 @@ from enterprise_user_${enterpriseId} where user_region_ids like concat('%', #{regionId}, '%') and active = true + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml index 8b2ec3158..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}, @@ -226,6 +228,31 @@ AND deleted = 0 + + + - select - line_id as lineId, - count(1) as recommendShopNum - from - xfsg_point_recommend - where - deleted = 0 and line_id in - - #{lineId} - - group by line_id - + - + - + - + - - - insert into xfsg_point_recommend (shop_id, point_id, development_manager, status) - values (#{item.shopId}, #{item.pointId}, #{item.developmentManager}, #{item.status}) - - + + + insert into xfsg_point_recommend (shop_id, point_id, development_manager, status) + values (#{item.shopId}, #{item.pointId}, #{item.developmentManager}, #{item.status}) + + - - update - xfsg_point_recommend - set - deleted = if(status = 1, 1, deleted), - development_manager = if(status in (2,4), #{developmentManager}, development_manager) - where - shop_id = #{shopId} - + + update + xfsg_point_recommend + set + deleted = if(status = 1, 1, deleted), + development_manager = if(status in (2,4), #{developmentManager}, development_manager) + where + shop_id = #{shopId} + - + select + p.id as pointId, + pr.line_id as lineId, + p.point_name as pointName, + p.point_code as pointCode, + p.region_id as regionId, + p.longitude as longitude, + p.latitude as latitude, + p.address as address, + p.point_score as pointScore, + p.point_area as pointArea, + p.point_status as pointStatus, + p.select_status as selectStatus, + p.create_time as createTime, + p.opportunity_point_code as opportunityPointCode, + p.opportunity_point_name as opportunityPointName, + c.picture_obj as pictureObj, + pr.status as recommendStatus, + e.store_name as shopName + from + xfsg_point_recommend pr inner join xfsg_point_info p on p.id = pr.point_id left join xfsg_point_detail_info c on p.id = c.point_id - where - p.deleted = 0 and pr.shop_id = #{request.shopId} and pr.deleted = 0 - - and pr.status = 1 and p.select_status = 0 - - - and pr.status = 2 and p.select_status = 1 and p.shop_id = #{request.shopId} - - - and pr.status in (5, 6) - - - and (p.province_code = #{request.areaCode} or p.city_code = #{request.areaCode} or p.district_code = #{request.areaCode}) - + left JOIN xfsg_shop_info d ON c.shop_id = d.id + left JOIN store_${enterpriseId} e ON d.shop_code = e.store_num + where + p.deleted = 0 and pr.shop_id = #{request.shopId} and pr.deleted = 0 + + and pr.status = 1 and p.select_status = 0 + + + and pr.status = 2 and p.select_status = 1 and p.shop_id = #{request.shopId} + + + and pr.status in (5, 6) + + + and (p.province_code = #{request.areaCode} or p.city_code = #{request.areaCode} or p.district_code = + #{request.areaCode}) + - + - - update - xfsg_point_recommend - set - status = if(shop_id = #{shopId}, 2, 3) - where point_id = #{pointId} and deleted = 0 and status = 1 - + + update + xfsg_point_recommend + set + status = if(shop_id = #{shopId}, 2, 3) + where point_id = #{pointId} and deleted = 0 and status = 1 + - - update - xfsg_point_recommend - set - status = 5, - reason = #{reason} - where point_id = #{pointId} and shop_id = #{shopId} and deleted = 0 and status = 1 - - - + + update + xfsg_point_recommend + set + status = 5, + reason = #{reason} + where point_id = #{pointId} and shop_id = #{shopId} and deleted = 0 and status = 1 + - + + + - - update xfsg_point_recommend - set - shop_id = case id - - when #{item.id} then #{item.shopId} - - end - where - id in - - #{entity.id} - - + + update xfsg_point_recommend + set + shop_id = case id + + when #{item.id} then #{item.shopId} + + end + where + id in + + #{entity.id} + + \ No newline at end of file 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/MiniShopDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/MiniShopDTO.java new file mode 100644 index 000000000..a759a76f3 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/MiniShopDTO.java @@ -0,0 +1,19 @@ +package com.cool.store.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: WangShuo + * @Date: 2025/04/02/18:20 + * @Version 1.0 + * @注释: + */ +@Data +public class MiniShopDTO { + + @ApiModelProperty("门店名称") + private String shopName; + @ApiModelProperty("地址") + private String address; +} 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/dto/UserDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/UserDTO.java new file mode 100644 index 000000000..a6992571c --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/UserDTO.java @@ -0,0 +1,18 @@ +package com.cool.store.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: WangShuo + * @Date: 2025/04/03/14:40 + * @Version 1.0 + * @注释: + */ +@Data +public class UserDTO { + @ApiModelProperty(value = "用户id") + private String userId; + @ApiModelProperty(value = "用户名") + private String name; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/point/MiniPointPageDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/point/MiniPointPageDTO.java index 06112fa25..a0900929b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/point/MiniPointPageDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/point/MiniPointPageDTO.java @@ -3,6 +3,8 @@ package com.cool.store.dto.point; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @Data public class MiniPointPageDTO { @@ -38,4 +40,13 @@ public class MiniPointPageDTO { @ApiModelProperty("1.待选择 2.已选择 3.已被他人选择 4.已签约 5.已拒绝 6.已失效") private Integer recommendStatus; + + @ApiModelProperty("机会点编号") + private String opportunityPointCode; + + @ApiModelProperty("机会点名称") + private String opportunityPointName; + + @ApiModelProperty("成功开店店名称") + private String openShopName; } \ No newline at end of file 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/AddPointDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java index 47f6911e8..dbc0009f6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java @@ -227,6 +227,24 @@ public class AddPointDetailRequest { @ApiModelProperty("人流测算 1.>400人/时以上, 2.300～400人/时, 3.200～300人/时, 4.100～200人/时") private Integer flowRateCalculate; + @ApiModelProperty("机会点编号") + private String opportunityPointCode; + + @ApiModelProperty("机会点名称") + private String opportunityPointName; + + @ApiModelProperty("省编码") + private String provinceCode; + + @ApiModelProperty("市编码") + private String cityCode; + + @ApiModelProperty("区/县编码") + private String districtCode; + + @ApiModelProperty("铺位经纬度geohash") + @NotBlank(message = "铺位经纬度geohash不能为空") + private String location; public static PointDetailInfoDO convertDO(AddPointDetailRequest request) { PointDetailInfoDO result = new PointDetailInfoDO(); @@ -280,6 +298,11 @@ public class AddPointDetailRequest { public static PointInfoDO convertPointDO(AddPointDetailRequest request) { PointInfoDO result = new PointInfoDO(); + result.setOpportunityPointName(request.getOpportunityPointName()); + result.setOpportunityPointCode(request.getOpportunityPointCode()); + result.setProvinceCode(request.getProvinceCode()); + result.setCityCode(request.getCityCode()); + result.setDistrictCode(request.getDistrictCode()); result.setPointName(request.getPointName()); result.setRegionId(request.getRegionId()); result.setPointArea(request.getPointArea()); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index 654460031..e09dfe68f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -22,6 +23,10 @@ public class AddSignFranchiseRequest { private String shopName; private String detailAddress; + + @ApiModelProperty("店铺编码") + @NotBlank(message = "shopCode不能为空") + private String shopCode; /** * SignTypeEnum */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java index 21052b687..e5e38bee0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java @@ -5,6 +5,7 @@ import com.cool.store.entity.MemberQuestionDO; import com.cool.store.entity.QualificationsInfoDO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.NotBlank; @@ -90,6 +91,8 @@ public class JoinIntentionRequest { private String businessLicense; @ApiModelProperty("统一社会信用代码") private String unifiedSocialCreditCode; + @ApiModelProperty("督导") + private String supervisor; public LineInfoDO toLineInfoDO() { LineInfoDO lineInfoDO = new LineInfoDO(); @@ -100,6 +103,9 @@ public class JoinIntentionRequest { lineInfoDO.setSex(String.valueOf(this.sex)); lineInfoDO.setWantShopAreaId(Long.valueOf(this.areaCode)); lineInfoDO.setId(this.lineId); + if (StringUtils.isNotBlank(this.supervisor)) { + lineInfoDO.setInvestmentManager(this.supervisor); + } return lineInfoDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java index 846feca35..2e9db35f6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java @@ -101,6 +101,9 @@ public class MiniAddPointRequest { @ApiModelProperty("区/县编码") private String districtCode; + @ApiModelProperty("铺位经纬度geohash") + private String location; + public static PointDetailInfoDO convertDO(MiniAddPointRequest request) { PointDetailInfoDO result = new PointDetailInfoDO(); result.setBusinessStatus(request.getBusinessStatus()); 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/request/UpdatePointDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdatePointDetailRequest.java index be1400a2c..433cd6829 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/UpdatePointDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdatePointDetailRequest.java @@ -72,6 +72,11 @@ public class UpdatePointDetailRequest extends AddPointDetailRequest { public static PointInfoDO convertPointDO(UpdatePointDetailRequest request) { PointInfoDO result = new PointInfoDO(); + result.setOpportunityPointName(request.getOpportunityPointName()); + result.setOpportunityPointCode(request.getOpportunityPointCode()); + result.setProvinceCode(request.getProvinceCode()); + result.setCityCode(request.getCityCode()); + result.setDistrictCode(request.getDistrictCode()); result.setId(request.getPointId()); result.setPointName(request.getPointName()); result.setRegionId(request.getRegionId()); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/oppty/BerthOperationRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/oppty/BerthOperationRequest.java index ce4d9acc4..0029a3f6c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/oppty/BerthOperationRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/oppty/BerthOperationRequest.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * @Author suzhuhong @@ -13,8 +14,8 @@ import javax.validation.constraints.NotBlank; @Data public class BerthOperationRequest { @ApiModelProperty(" 操作类型: 1(新增), 2(更新), 3(删除)") - @NotBlank(message = "操作类型不能为空") - private String opType; + @NotNull(message = "操作类型不能为空") + private Integer opType; @ApiModelProperty("机会点编号") @NotBlank(message = "机会点编号不能为空") @@ -33,7 +34,7 @@ public class BerthOperationRequest { private String userName; @ApiModelProperty("铺位ID") - @NotBlank(message = "铺位ID不能为空") + @NotNull(message = "铺位ID不能为空") private Integer berthId; @ApiModelProperty("铺位名称") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/BerthInfoResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/BerthInfoResponse.java index 919484788..66a858588 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/BerthInfoResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/BerthInfoResponse.java @@ -31,6 +31,6 @@ public class BerthInfoResponse { * 铺位经纬度 */ @ApiModelProperty("铺位经纬度") - private String geohash; + private String location; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/BrandResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/BrandResponse.java index fb1a928f3..fcfdbf08e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/BrandResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/BrandResponse.java @@ -31,7 +31,7 @@ public class BrandResponse { * 该品牌门店所在位置 */ @ApiModelProperty("该品牌门店所在位置") - private String geohash; + private String location; /** * 品牌数量 */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/OpportunityDetailResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/OpportunityDetailResponse.java index fd498c58d..bb65f69d8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/OpportunityDetailResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/OpportunityDetailResponse.java @@ -25,7 +25,7 @@ public class OpportunityDetailResponse { @ApiModelProperty("机会点地址") private String address; @ApiModelProperty("地理坐标 GeoHash 值") - private String geohash; + private String location; @ApiModelProperty("省编码") private Integer province; @ApiModelProperty("市编码") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/StoreInfoResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/StoreInfoResponse.java index ccf807505..e9efba337 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/StoreInfoResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/oppty/StoreInfoResponse.java @@ -46,5 +46,5 @@ public class StoreInfoResponse { * 门店经纬度 */ @ApiModelProperty("门店经纬度") - private String geohash; + private String location; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/MiniPointPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/MiniPointPageVO.java index 5fa76ce4b..3ca3b1fcb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/MiniPointPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/MiniPointPageVO.java @@ -66,6 +66,9 @@ public class MiniPointPageVO { @ApiModelProperty("纬度") private String latitude; + @ApiModelProperty("成功开店店名称") + private String openShopName; + public static List convertVO(List pointList, Map regionNameMap) { if(CollectionUtils.isEmpty(pointList)){ return Lists.newArrayList(); 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/OpportunityPointService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/OpportunityPointService.java new file mode 100644 index 000000000..8742304aa --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/OpportunityPointService.java @@ -0,0 +1,19 @@ +package com.cool.store.service; + +import com.cool.store.dto.MiniShopDTO; +import com.cool.store.vo.point.MiniPointPageVO; + +import java.util.List; + +/** + * @Author: WangShuo + * @Date: 2025/04/02/18:17 + * @Version 1.0 + * @注释: + */ +public interface OpportunityPointService { + + List getPointByOpportunityPointCode(String code); + + List getShopByOpportunityPointCode(String code); +} 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 0498042ff..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 @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.*; import com.cool.store.vo.LinePointBaseInfoVO; import com.cool.store.vo.point.*; @@ -23,7 +24,7 @@ public interface PointService { * @param userId * @return */ - Long addPointDetailInfo(AddPointDetailRequest shopPointDetailRequest, String userId); + Long addPointDetailInfo(AddPointDetailRequest shopPointDetailRequest, LoginUserInfo user); /** @@ -38,7 +39,7 @@ public interface PointService { * @param shopPointDetailRequest * @return */ - Long updatePointDetailInfo(UpdatePointDetailRequest shopPointDetailRequest); + Long updatePointDetailInfo(UpdatePointDetailRequest shopPointDetailRequest,LoginUserInfo user); /** * 生成铺位评估报告 @@ -301,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/UserAuthMappingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java index 98a42b63c..48a5c8379 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java @@ -1,8 +1,11 @@ package com.cool.store.service; +import com.cool.store.dto.UserDTO; import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.entity.UserAuthMappingDO; import com.cool.store.enums.UserRoleEnum; +import com.cool.store.response.oppty.UserResponse; +import com.github.pagehelper.PageInfo; import java.util.List; import java.util.Map; @@ -91,4 +94,5 @@ public interface UserAuthMappingService { */ EnterpriseUserDO hierarchicalSearch(UserRoleEnum supervision, Long regionId); + PageInfo getAllUser(String keyword, Integer pageNum, Integer pageSize); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpportunityPointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpportunityPointServiceImpl.java new file mode 100644 index 000000000..b053409f7 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpportunityPointServiceImpl.java @@ -0,0 +1,39 @@ +package com.cool.store.service.impl; + +import com.cool.store.dao.PointInfoDAO; +import com.cool.store.dto.MiniShopDTO; +import com.cool.store.entity.PointInfoDO; +import com.cool.store.service.OpportunityPointService; +import com.cool.store.vo.point.MiniPointPageVO; +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 java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * @Author: WangShuo + * @Date: 2025/04/02/18:17 + * @Version 1.0 + * @注释: + */ +@Service +public class OpportunityPointServiceImpl implements OpportunityPointService { + + @Autowired + private PointInfoDAO pointInfoDAO; + @Value("${mybatis.configuration.variables.enterpriseId}") + private String enterpriseId; + @Override + public List getPointByOpportunityPointCode(String code) { + return pointInfoDAO.getPointByOpportunityPointCode(code); + } + + @Override + public List getShopByOpportunityPointCode(String code) { + return pointInfoDAO.getShopByOpportunityPointCode(enterpriseId,code); + } +} 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 3f0c8c02a..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 @@ -3,7 +3,9 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; 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; @@ -12,6 +14,7 @@ import com.cool.store.enums.*; import com.cool.store.enums.point.*; import com.cool.store.exception.ServiceException; import com.cool.store.request.*; +import com.cool.store.request.oppty.BerthOperationRequest; import com.cool.store.service.*; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.poi.DateUtils; @@ -52,6 +55,8 @@ import java.util.stream.Collectors; @Service public class PointServiceImpl implements PointService { + @Resource + private ThirdOpportunityService thirdOpportunityService; @Resource private ShopInfoDAO shopInfoDAO; @Resource @@ -98,7 +103,8 @@ public class PointServiceImpl implements PointService { @Override @Transactional(rollbackFor = Exception.class) - public Long addPointDetailInfo(AddPointDetailRequest shopPointDetailRequest, String userId) { + public Long addPointDetailInfo(AddPointDetailRequest shopPointDetailRequest, LoginUserInfo user) { + String userId = user.getUserId(); PointInfoDO pointInfo = AddPointDetailRequest.convertPointDO(shopPointDetailRequest); pointInfo.setPointCode(generateCode()); pointInfo.setDevelopmentManager(userId); @@ -107,6 +113,18 @@ public class PointServiceImpl implements PointService { PointDetailInfoDO shopPoint = AddPointDetailRequest.convertDO(shopPointDetailRequest); shopPoint.setPointId(pointId); pointDetailInfoDAO.addPointDetailInfo(shopPoint); + //推送铺位至三方平台 + BerthOperationRequest request1 = new BerthOperationRequest(); + request1.setOpType(OpTypeEnum.INSERT.getCode()); + request1.setCode(shopPointDetailRequest.getOpportunityPointCode()); + request1.setUserId(userId); + request1.setMobile(user.getMobile()); + request1.setUserName(user.getName()); + request1.setBerthId(Math.toIntExact(pointId)); + request1.setName(pointInfo.getPointName()); + request1.setAddress(pointInfo.getAddress()); + request1.setLocation(shopPointDetailRequest.getLocation()); + thirdOpportunityService.berthOperation(request1); return pointId; } @@ -122,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())); @@ -140,7 +160,7 @@ public class PointServiceImpl implements PointService { @Override @Transactional(rollbackFor = Exception.class) - public Long updatePointDetailInfo(UpdatePointDetailRequest shopPointDetailRequest) { + public Long updatePointDetailInfo(UpdatePointDetailRequest shopPointDetailRequest, LoginUserInfo user) { PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopPointDetailRequest.getPointId()); if (Objects.isNull(pointInfo)) { log.error("铺位基本信息不存在"); @@ -151,6 +171,25 @@ public class PointServiceImpl implements PointService { shopPointInfo.setPointScore(shopPoint.getTotalPointScore()); pointInfoDAO.perfectPointInfo(shopPointInfo); pointDetailInfoDAO.updatePartFieldPointDetail(shopPoint); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(pointInfo.getLineId()); + //推送铺位至三方平台 + BerthOperationRequest request1 = new BerthOperationRequest(); + request1.setCode(shopPointDetailRequest.getOpportunityPointCode()); + if (pointInfo.getPointSource().equals(PointSourceEnum.POINT_SOURCE_1.getCode())) { + request1.setUserId(user.getUserId()); + request1.setMobile(user.getMobile()); + request1.setUserName(user.getName()); + } else { + request1.setUserId(lineInfoDO.getPartnerId()); + request1.setMobile(lineInfoDO.getMobile()); + request1.setUserName(lineInfoDO.getUsername()); + } + request1.setOpType(OpTypeEnum.UPDATE.getCode()); + request1.setBerthId(Math.toIntExact(shopPointInfo.getId())); + request1.setName(shopPointInfo.getPointName()); + request1.setAddress(shopPointInfo.getAddress()); + request1.setLocation(shopPointDetailRequest.getLocation()); + thirdOpportunityService.berthOperation(request1); return shopPointDetailRequest.getPointId(); } @@ -518,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()); @@ -547,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()); @@ -602,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()); @@ -715,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()); @@ -731,32 +770,16 @@ public class PointServiceImpl implements PointService { @Override public PageInfo getLineRecommendPointPage(MiniPointPageRequest request) { - 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(request); - return new PageInfo<>(miniPointPage); - } - return new PageInfo<>(); + PageInfo resultPage = new PageInfo(pointPage); + resultPage.setList(resultList); + return resultPage; } @Override @@ -885,6 +908,18 @@ public class PointServiceImpl implements PointService { updatePoint.setId(pointId); updatePoint.setShopId(shopInfo.getId()); pointInfoDAO.updatePointInfo(updatePoint); + //推送铺位至三方平台 + BerthOperationRequest request1 = new BerthOperationRequest(); + request1.setOpType(OpTypeEnum.INSERT.getCode()); + request1.setCode(request.getOpportunityPointCode()); + request1.setUserId(lineInfo.getPartnerId()); + request1.setMobile(lineInfo.getMobile()); + request1.setUserName(lineInfo.getUsername()); + request1.setBerthId(Math.toIntExact(pointId)); + request1.setName(pointInfo.getPointName()); + request1.setAddress(pointInfo.getAddress()); + request1.setLocation(request.getLocation()); + thirdOpportunityService.berthOperation(request1); HashMap map = new HashMap<>(); map.put("partnerUsername", lineInfo.getUsername()); map.put("partnerMobile", lineInfo.getMobile()); @@ -1047,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()); @@ -1145,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-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index d35c48ddb..031fa79ca 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -205,6 +205,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopInfoDO.setRegionId(request.getRegionId()); shopInfoDO.setShopName(request.getShopName()); shopInfoDO.setDetailAddress(request.getDetailAddress()); + shopInfoDO.setShopCode(request.getShopCode()); shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); return new ResponseResult(200000, "提交成功"); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index c995623ba..9a9317ea2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.cool.store.constants.CommonConstants; import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.RegionAreaConfigDao; +import com.cool.store.dto.UserDTO; import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ServiceException; @@ -15,6 +16,8 @@ import com.cool.store.utils.RedisConstantUtil; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.poi.constant.Constants; import com.cool.store.vo.SysRoleVO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; @@ -41,6 +44,9 @@ import java.util.stream.Collectors; @Slf4j public class UserAuthMappingServiceImpl implements UserAuthMappingService { + @Value("${mybatis.configuration.variables.enterpriseId}") + private String eid; + @Resource private UserAuthMappingMapper userAuthMappingMapper; @@ -446,6 +452,13 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { return supervisionUser; } + @Override + public PageInfo getAllUser(String keyword, Integer pageNum, Integer pageSize) { + PageHelper.startPage(pageNum,pageSize); + List allUser = enterpriseUserDAO.getAllUser(eid, keyword); + return new PageInfo<>(allUser); + } + private List extractNumbers(String regionPath) { List regionIds = new ArrayList<>(); Pattern pattern = Pattern.compile("\\d+"); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java index 6a99eb3a2..7787e48fc 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java @@ -39,7 +39,7 @@ public class PointController { @PostMapping("/add") public ResponseResult addPointDetailInfo(@RequestBody @Validated AddPointDetailRequest shopPointDetailRequest) { log.info("新增铺位：{}", JSONObject.toJSONString(shopPointDetailRequest)); - return ResponseResult.success(pointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUserId())); + return ResponseResult.success(pointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUser())); } @ApiOperation("铺位详情") @@ -52,7 +52,7 @@ public class PointController { @ApiOperation("完善铺位") @PostMapping("/update") public ResponseResult updatePointDetailInfo(@RequestBody @Validated UpdatePointDetailRequest shopPointDetailRequest) { - return ResponseResult.success(pointService.updatePointDetailInfo(shopPointDetailRequest)); + return ResponseResult.success(pointService.updatePointDetailInfo(shopPointDetailRequest,CurrentUserHolder.getUser())); } @ApiOperation("生成评估报告") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java index bbaaf3405..765021cff 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java @@ -1,14 +1,17 @@ package com.cool.store.controller.webc; +import com.cool.store.dto.UserDTO; import com.cool.store.request.LinesRequest; import com.cool.store.request.UpdatePartnerNameRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.LinePayService; import com.cool.store.service.LineService; +import com.cool.store.service.UserAuthMappingService; import com.cool.store.vo.IntendProcessTotalVO; import com.cool.store.vo.LineInfoVO; import com.cool.store.vo.LineVO; import com.cool.store.vo.interview.AppointmentTimeVO; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -39,7 +42,8 @@ public class LineController { @Resource LinePayService linePayService; - + @Resource + private UserAuthMappingService userAuthMappingService; @ApiOperation("查询线索详情") @GetMapping("/getLineDetail") @ApiImplicitParams({ @@ -70,7 +74,13 @@ public class LineController { return ResponseResult.success(lineService.updatePartnerName(request.getUsername(),request.getLineId())); } - + @ApiOperation("查询所有人支持模糊查询") + @GetMapping("/getAllUser") + public ResponseResult> getAllUser(@RequestParam("keyword")String keyword , + @RequestParam("pageNum")Integer pageNum, + @RequestParam("pageSize")Integer pageSize ) { + return ResponseResult.success(userAuthMappingService.getAllUser(keyword,pageNum,pageSize)); + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpportunityPointController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpportunityPointController.java new file mode 100644 index 000000000..b195acd23 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpportunityPointController.java @@ -0,0 +1,38 @@ +package com.cool.store.controller.webc; + +import com.cool.store.dto.MiniShopDTO; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.OpportunityPointService; +import com.cool.store.vo.point.MiniPointPageVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author: WangShuo + * @Date: 2025/04/02/18:44 + * @Version 1.0 + * @注释: + */ +@RestController +@Api(tags = "机会点详情") +@RequestMapping("/mini/opportunityPoint") +public class MiniOpportunityPointController { + @Resource + private OpportunityPointService opportunityPointService; + @GetMapping("/getPoints") + @ApiModelProperty("根据机会点编号获取铺位信息") + public ResponseResult >getPointByOpportunityPointCode(String code) { + return ResponseResult.success(opportunityPointService.getPointByOpportunityPointCode(code)); + } + @GetMapping("/getShops") + @ApiModelProperty("根据机会点编号获取门店信息") + public ResponseResult >getShopByOpportunityPointCode(String code) { + return ResponseResult.success(opportunityPointService.getShopByOpportunityPointCode(code)); + } +} 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)); + } }