user/role/tright 6.21

在写胖丁伙伴

src/main/java/com/pangding/web/authority/feign/StoreFeign.java

@@ -21,7 +21,7 @@ public interface StoreFeign {
      * @return
      */
     @RequestMapping("/merchantCreate")
-    public ResponseResult<String> merchantCreate(@RequestBody MerchantCreateReqVo req);
+    ResponseResult<String> merchantCreate(@RequestBody MerchantCreateReqVo req);
 
     /**
      * 通过公司还是id获取商户信息

src/main/java/com/pangding/web/authority/vo/Merchant.java

@@ -12,6 +12,15 @@ import java.math.BigDecimal;
  * @create 2019-04-28 15:21
  */
 public class Merchant extends BaseVo {
+    public Merchant() {
+    }
+
+    public Merchant(String name, Integer type, String productCompanyId) {
+        this.name = name;
+        this.type = type;
+        this.productCompanyId = productCompanyId;
+    }
+
     /**
      * 主键
      */
@@ -45,11 +54,13 @@ public class Merchant extends BaseVo {
     /**
      * 行政区域编号
      */
+    @TableAnnotation("area_code")
     private String areaCode;
 
     /**
      * 行政区域名称
      */
+    @TableAnnotation("area_name")
     private String areaName;
 
     /**
@@ -60,7 +71,7 @@ public class Merchant extends BaseVo {
     /**
      * 类型（1：景区；2：餐饮；3：酒店）
      */
-    private int type;
+    private Integer type;
 
     /**
      * 标签
@@ -75,7 +86,7 @@ public class Merchant extends BaseVo {
     /**
      * 状态（0：上架；1：下架）
      */
-    private String status;
+    private Integer status;
 
     /**
      * 游玩耗时
@@ -87,18 +98,28 @@ public class Merchant extends BaseVo {
      * 电话
      */
     private String phone;
+    /**
+     * 商家简介
+     */
+    private String synopsis;
 
     /**
      * 供应商
      */
     @TableAnnotation("product_company_id")
     private String productCompanyId;
-
+    /**
+     * 供应商名称
+     */
+    @TableAnnotation("product_company_name")
+    private String productCompanyName;
     /**
      * 接口商
      */
     @TableAnnotation("interface_company_id")
     private String interfaceCompanyId;
+    @TableAnnotation("interface_company_Name")
+    private String interfaceCompanyName;
 
     /**
      * 营业时间(开始)
@@ -135,6 +156,14 @@ public class Merchant extends BaseVo {
      */
     private String source;
 
+    public String getProductCompanyName() {
+        return productCompanyName;
+    }
+
+    public void setProductCompanyName(String productCompanyName) {
+        this.productCompanyName = productCompanyName;
+    }
+
     public String getSource() {
         return source;
     }
@@ -215,11 +244,11 @@ public class Merchant extends BaseVo {
         this.address = address;
     }
 
-    public int getType() {
+    public Integer getType() {
         return type;
     }
 
-    public void setType(int type) {
+    public void setType(Integer type) {
         this.type = type;
     }
 
@@ -239,11 +268,11 @@ public class Merchant extends BaseVo {
         this.level = level;
     }
 
-    public String getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
@@ -318,4 +347,20 @@ public class Merchant extends BaseVo {
     public void setUsername(String username) {
         this.username = username;
     }
+
+    public String getInterfaceCompanyName() {
+        return interfaceCompanyName;
+    }
+
+    public void setInterfaceCompanyName(String interfaceCompanyName) {
+        this.interfaceCompanyName = interfaceCompanyName;
+    }
+
+    public String getSynopsis() {
+        return synopsis;
+    }
+
+    public void setSynopsis(String synopsis) {
+        this.synopsis = synopsis;
+    }
 }