Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java

@@ -9,8 +9,8 @@ import java.util.Objects;
 import javax.persistence.*;
 
 @Data
-@Table(name = "xfsg_shop_point_detail_info")
-public class ShopPointDetailInfoDO {
+@Table(name = "xfsg_point_detail_info")
+public class PointDetailInfoDO {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

coolstore-partner-model/src/main/java/com/cool/store/entity/PointInfoDO.java

@@ -6,8 +6,8 @@ import java.util.Date;
 import javax.persistence.*;
 
 @Data
-@Table(name = "xfsg_shop_point_info")
-public class ShopPointInfoDO {
+@Table(name = "xfsg_point_info")
+public class PointInfoDO {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

coolstore-partner-model/src/main/java/com/cool/store/entity/PointRecommendDO.java

@@ -6,8 +6,8 @@ import java.util.Date;
 import javax.persistence.*;
 
 @Data
-@Table(name = "xfsg_shop_point_recommend")
-public class ShopPointRecommendDO {
+@Table(name = "xfsg_point_recommend")
+public class PointRecommendDO {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java

@@ -1,7 +1,7 @@
 package com.cool.store.request;
 
-import com.cool.store.entity.ShopPointDetailInfoDO;
-import com.cool.store.entity.ShopPointInfoDO;
+import com.cool.store.entity.PointDetailInfoDO;
+import com.cool.store.entity.PointInfoDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,7 +9,7 @@ import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 
 @Data
-public class AddShopPointDetailRequest {
+public class AddPointDetailRequest {
 
     @ApiModelProperty("铺位名称")
     private String pointName;
@@ -222,8 +222,8 @@ public class AddShopPointDetailRequest {
     private String pictureObj;
 
 
-    public static ShopPointDetailInfoDO convertDO(AddShopPointDetailRequest request) {
-        ShopPointDetailInfoDO result = new ShopPointDetailInfoDO();
+    public static PointDetailInfoDO convertDO(AddPointDetailRequest request) {
+        PointDetailInfoDO result = new PointDetailInfoDO();
         result.setBussinessStatus(request.getBussinessStatus());
         result.setNineFlowRate(request.getNineFlowRate());
         result.setTenFlowRate(request.getTenFlowRate());
@@ -277,8 +277,8 @@ public class AddShopPointDetailRequest {
         return result;
     }
 
-    public static ShopPointInfoDO convertPointDO(AddShopPointDetailRequest request) {
-        ShopPointInfoDO result = new ShopPointInfoDO();
+    public static PointInfoDO convertPointDO(AddPointDetailRequest request) {
+        PointInfoDO result = new PointInfoDO();
         result.setPointName(request.getPointName());
         result.setRegionId(request.getRegionId());
         result.setPointArea(request.getPointArea());

coolstore-partner-model/src/main/java/com/cool/store/request/UpdatePointDetailRequest.java

@@ -1,15 +1,14 @@
 package com.cool.store.request;
 
-import com.cool.store.entity.ShopPointDetailInfoDO;
-import com.cool.store.entity.ShopPointInfoDO;
+import com.cool.store.entity.PointDetailInfoDO;
+import com.cool.store.entity.PointInfoDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 
 @Data
-public class UpdateShopPointDetailRequest extends AddShopPointDetailRequest{
+public class UpdatePointDetailRequest extends AddPointDetailRequest {
 
     @NotNull
     @ApiModelProperty("点位id")
@@ -17,8 +16,8 @@ public class UpdateShopPointDetailRequest extends AddShopPointDetailRequest{
 
 
 
-    public static ShopPointDetailInfoDO convertDO(UpdateShopPointDetailRequest request) {
-        ShopPointDetailInfoDO result = new ShopPointDetailInfoDO();
+    public static PointDetailInfoDO convertDO(UpdatePointDetailRequest request) {
+        PointDetailInfoDO result = new PointDetailInfoDO();
         result.setPointId(request.getPointId());
         result.setBussinessStatus(request.getBussinessStatus());
         result.setNineFlowRate(request.getNineFlowRate());
@@ -73,8 +72,8 @@ public class UpdateShopPointDetailRequest extends AddShopPointDetailRequest{
         return result;
     }
 
-    public static ShopPointInfoDO convertPointDO(UpdateShopPointDetailRequest request) {
-        ShopPointInfoDO result = new ShopPointInfoDO();
+    public static PointInfoDO convertPointDO(UpdatePointDetailRequest request) {
+        PointInfoDO result = new PointInfoDO();
         result.setId(request.getPointId());
         result.setPointName(request.getPointName());
         result.setRegionId(request.getRegionId());

coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java

@@ -1,14 +1,14 @@
 package com.cool.store.vo.point;
 
-import com.cool.store.entity.ShopPointDetailInfoDO;
-import com.cool.store.entity.ShopPointInfoDO;
+import com.cool.store.entity.PointDetailInfoDO;
+import com.cool.store.entity.PointInfoDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
-public class ShopPointDetailVO {
+public class PointDetailVO {
 
     @ApiModelProperty("店铺id")
     private Long pointId;
@@ -227,8 +227,8 @@ public class ShopPointDetailVO {
     private String pictureObj;
 
 
-    public static ShopPointDetailVO convertVO(ShopPointInfoDO pointInfo, ShopPointDetailInfoDO pointDetailInfo) {
-        ShopPointDetailVO result = new ShopPointDetailVO();
+    public static PointDetailVO convertVO(PointInfoDO pointInfo, PointDetailInfoDO pointDetailInfo) {
+        PointDetailVO result = new PointDetailVO();
         result.setPointId(pointInfo.getId());
         result.setPointName(pointInfo.getPointName());
         result.setPointCode(pointInfo.getPointCode());