From b771de1dbfa6d7533f3bf5ce6db9240d71b57f0c Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Thu, 18 Apr 2024 15:27:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/enums/point/PointSourceEnum.java    | 30 +++++++++++++++++++
 .../main/resources/mapper/PointInfoMapper.xml |  4 +--
 .../resources/mapper/PointTodoInfoMapper.xml  |  2 +-
 .../com/cool/store/entity/PointInfoDO.java    |  6 ++--
 .../cool/store/vo/point/PointDetailVO.java    |  9 ++++++
 .../store/service/impl/PointServiceImpl.java  |  3 +-
 6 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/point/PointSourceEnum.java

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PointSourceEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PointSourceEnum.java
new file mode 100644
index 000000000..dbee316dd
--- /dev/null
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PointSourceEnum.java
@@ -0,0 +1,30 @@
+package com.cool.store.enums.point;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: PointSourceEnum
+ * @Description:店铺来源
+ * @date 2024-04-18 15:12
+ */
+public enum PointSourceEnum {
+    //店铺来源：1、鲜丰选址人员寻铺 2、加盟商自采
+    POINT_SOURCE_1(1, "鲜丰选址人员寻铺"),
+    POINT_SOURCE_2(2, "加盟商自采");
+
+    private Integer code;
+    private String name;
+
+    PointSourceEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+}
diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml
index 82578dfdf..fea8f078c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml
@@ -19,14 +19,14 @@
     <result column="point_score" jdbcType="INTEGER" property="pointScore" />
     <result column="select_status" jdbcType="TINYINT" property="selectStatus" />
     <result column="submit_audit_count" jdbcType="TINYINT" property="submitAuditCount" />
-    <result column="is_line_upload" jdbcType="BIT" property="isLineUpload" />
+    <result column="point_source" jdbcType="TINYINT" property="pointSource" />
     <result column="deleted" jdbcType="BIT" property="deleted" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
 
   <sql id="allColumn">
-    id, point_code, point_name, region_id, shop_id, line_id, point_area, longitude, latitude, address, development_manager, operate_user_id, development_time, point_status, point_score, select_status, submit_audit_count, is_line_upload, deleted, create_time, update_time
+    id, point_code, point_name, region_id, shop_id, line_id, point_area, longitude, latitude, address, development_manager, operate_user_id, development_time, point_status, point_score, select_status, submit_audit_count, point_source, deleted, create_time, update_time
   </sql>
 
   <select id="getMyPointData" resultType="com.cool.store.vo.point.PointHomePageDataVO">
diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml
index 4e533c537..7a4b69114 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml
@@ -87,7 +87,7 @@
       b.shop_id,
       b.select_status,
       b.operate_user_id,
-      b.is_line_upload,
+      b.point_source,
       b.create_time,
       b.update_time
     from
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 673f5f1d5..14110b0cb 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
@@ -106,10 +106,10 @@ public class PointInfoDO {
     private Integer submitAuditCount;
 
     /**
-     * 是否是加盟商上传
+     * 店铺来源
      */
-    @Column(name = "is_line_upload")
-    private Boolean isLineUpload;
+    @Column(name = "point_source")
+    private Integer pointSource;
 
     /**
      * 删除标识
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 71b499ddc..5bd620ca8 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
@@ -26,6 +26,12 @@ public class PointDetailVO {
     @ApiModelProperty("所属大区")
     private Long regionId;
 
+    @ApiModelProperty("所属大区")
+    private String regionNodeName;
+
+    @ApiModelProperty("店铺来源：1、鲜丰选址人员寻铺 2、加盟商自采")
+    private Integer pointSource;
+
     @ApiModelProperty("经度")
     private String longitude;
 
@@ -250,6 +256,9 @@ public class PointDetailVO {
         if(PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())){
             result.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode());
         }
+        result.setPointArea(pointInfo.getPointArea());
+        result.setRegionId(pointInfo.getRegionId());
+        result.setPointSource(pointInfo.getPointSource());
         result.setSelectStatus(pointInfo.getSelectStatus());
         result.setPointScore(pointInfo.getPointScore());
         result.setBusinessStatus(pointDetailInfo.getBusinessStatus());
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 6983f5155..2e9466fe3 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
@@ -110,6 +110,7 @@ public class PointServiceImpl implements PointService {
             throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
         }
         PointDetailVO result = PointDetailVO.convertVO(pointInfo, pointDetailInfo);
+        result.setRegionNodeName(regionService.getBelongWarRegionName(pointInfo.getRegionId()));
         if(Objects.nonNull(isGetNodeNo) && isGetNodeNo){
             result.setCurNodeNo(pointTodoInfoDAO.getCurNodeNoByPoint(pointId));
         }
@@ -703,7 +704,7 @@ public class PointServiceImpl implements PointService {
         pointInfo.setSelectStatus(SelectStatusEnum.SELECT_STATUS_1.getCode());
         pointInfo.setDevelopmentManager(lineInfo.getDevelopmentManager());
         pointInfo.setDevelopmentTime(new Date());
-        pointInfo.setIsLineUpload(Boolean.TRUE);
+        pointInfo.setPointSource(PointSourceEnum.POINT_SOURCE_2.getCode());
         pointInfo.setPointCode(generateCode());
         Long pointId = pointInfoDAO.addPointInfo(pointInfo);
         pointDetailInfo.setPointId(pointId);