123

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BranchCompany.java

@@ -18,6 +18,10 @@ public class BranchCompany {
     @ApiModelProperty("主键id")
     private Integer id;
 
+    @Column(name = "company_base_id")
+    @ApiModelProperty("主键id")
+    private Integer companyBaseId;
+
     /**
      * 分公司名称
      */
@@ -119,4 +123,16 @@ public class BranchCompany {
     @ApiModelProperty("旅游客服电话")
     private String tourServicePhone;
 
+    /**
+     * 上下架:1-上架；2-下架
+     */
+    private Integer state;
+
+
+    /**
+     * 是否删除：0-正常；1-删除
+     */
+    @Column(name = "is_del")
+    private Integer isDel;
+
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BranchCompanyStockRight.java

 package com.xxfc.platform.vehicle.entity;
 
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import lombok.Data;
-
 import javax.persistence.*;
 import java.math.BigDecimal;
 
@@ -17,10 +15,10 @@ public class BranchCompanyStockRight{
     private Integer id;
 
     /**
-     * 分公司id
+     * 有限公司id
      */
-    @Column(name = "company_id")
-    private Integer companyId;
+    @Column(name = "company_base_id")
+    private Integer companyBaseId;
 
     /**
      * 剩余股份
@@ -37,15 +35,13 @@ public class BranchCompanyStockRight{
      */
     private BigDecimal price;
 
-    private Integer state;
-
-    @Column(name = "company_pic")
-    private String companyPic;
-
     /**
-     * 详情
+     * 股价类型:1-万/股；2-港万/股
      */
-    private String info;
+    private Integer type;
+
+    private Integer state;
+
 
     /**
      * 创建时间

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/CompanyBase.java

+package com.xxfc.platform.vehicle.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Table(name = "company_base")
+public class CompanyBase {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    /**
+     * 分公司名称
+     */
+    @ApiModelProperty("分公司名称")
+    private String name;
+
+    /**
+     * 公司封面
+     */
+    @ApiModelProperty("公司封面")
+    private String cover;
+
+    /**
+     * 轮播图
+     */
+    @ApiModelProperty("轮播图")
+    private String images;
+
+    /**
+     * 片区id
+     */
+    @Column(name = "zone_id")
+    @ApiModelProperty("片区id")
+    private Integer zoneId;
+
+
+    /**
+     * 公司简介
+     */
+    @ApiModelProperty("公司简介")
+    private String describes;
+
+    /**
+     * 详情
+     */
+    @ApiModelProperty("详情")
+    private String content;
+
+
+
+    /**
+     * 地址-省/直辖市(编码)
+     */
+    @Column(name = "addr_province")
+    @ApiModelProperty("地址-省/直辖市(编码)")
+    private Integer addrProvince;
+
+    /**
+     * 地址-市(编码)
+     */
+    @Column(name = "addr_city")
+    @ApiModelProperty("地址-市(编码)")
+    private Integer addrCity;
+
+    /**
+     * 地址-镇/县（编码）
+     */
+    @Column(name = "addr_town")
+    @ApiModelProperty("地址-镇/县（编码）")
+    private Integer addrTown;
+
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "crt_time")
+    @ApiModelProperty("创建时间")
+    private Long crtTime;
+
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "upd_time")
+    @ApiModelProperty("更新时间")
+    private Long updTime;
+
+    /**
+     * 是否删除：0-正常；1-删除
+     */
+    @Column(name = "is_del")
+    @ApiModelProperty("更新时间")
+    private Integer isDel;
+
+
+
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyStockRightBiz.java

@@ -147,8 +147,6 @@ public class BranchCompanyStockRightBiz extends BaseBiz<BranchCompanyStockRightM
                 stockInfoVo.setBalance(balance);
                 stockInfoVo.setTotal(total);
                 stockInfoVo.setState(2);
-                stockInfoVo.setCompanyPic(companyPic);
-                stockInfoVo.setCompanyId(companyId);
                 list.add(stockInfoVo);
             }
                mapper.addCompamyList(list);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

+package com.xxfc.platform.vehicle.biz;
+
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.entity.*;
+import com.xxfc.platform.vehicle.mapper.CompanyBaseMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
+
+
+    //临时数据同步
+  //  public ObjectRestResponse
+
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/CompanyBaseMapper.java

+package com.xxfc.platform.vehicle.mapper;
+
+
+import com.xxfc.platform.vehicle.entity.CompanyBase;
+import tk.mybatis.mapper.common.Mapper;
+
+
+public interface CompanyBaseMapper extends Mapper<CompanyBase> {
+
+}
\ No newline at end of file