Просмотр исходного кода

[商户][新增]:商户新增主谈人、辅谈人,并支持导出

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
dd26958d99
3 измененных файлов: 21 добавлений и 8 удалений
  1. +3
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906121703__ADD_MERCHANT_TALK_USER.sql
  2. +13
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  3. +5
    -2
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 3
- 0
mallinkAdmin/src/main/resources/db/migration/V201906121703__ADD_MERCHANT_TALK_USER.sql Просмотреть файл

@@ -0,0 +1,3 @@
alter table wx_merchant
ADD COLUMN `talk_user_main` VARCHAR(50) NULL DEFAULT NULL COMMENT '主谈人',
ADD COLUMN `talk_user_aux` VARCHAR(50) NULL DEFAULT NULL COMMENT '辅谈人';

+ 13
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -111,8 +111,8 @@ public class WxMerchant extends BaseEntity {
@Excel(name="联系方式",width = 20,orderNum = "3") @Excel(name="联系方式",width = 20,orderNum = "3")
private String linkPhone; private String linkPhone;


@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
@Excel(name="创建时间",width = 20,format="yyyy-MM-dd",orderNum = "10") @Excel(name="创建时间",width = 20,format="yyyy-MM-dd",orderNum = "10")
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate; private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate; private Date updateDate;
@@ -156,8 +156,8 @@ public class WxMerchant extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="是否为商管商户 1是 0否",name="status") @io.swagger.annotations.ApiModelProperty(value="是否为商管商户 1是 0否",name="status")
private Integer isAdmin; private Integer isAdmin;


@Excel(name = "待缴提醒", width = 20, orderNum = "12")
@io.swagger.annotations.ApiModelProperty(value = "待缴提醒", name = "billSetting") @io.swagger.annotations.ApiModelProperty(value = "待缴提醒", name = "billSetting")
@Excel(name = "待缴提醒", width = 20, orderNum = "12")
private Integer billSetting; private Integer billSetting;


@io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime") @io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime")
@@ -172,12 +172,19 @@ public class WxMerchant extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc") @io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc")
private String actionDesc; private String actionDesc;


@Transient
private WxProfitSharingReceiver wxProfitSharingReceiver;
@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel")
private Integer isDel;

@Excel(name = "主谈人", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value = "主谈人", name = "talkUserMain")
private String talkUserMain;


@Excel(name = "辅谈人", width = 20, orderNum = "14")
@io.swagger.annotations.ApiModelProperty(value = "辅谈人", name = "talkUserAux")
private String talkUserAux;


@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = " ")
private Integer isDel;
@Transient
private WxProfitSharingReceiver wxProfitSharingReceiver;


@Override @Override
public String getSortColumns() { public String getSortColumns() {


+ 5
- 2
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Просмотреть файл

@@ -27,14 +27,17 @@
<result column="qr_code" jdbcType="VARCHAR" property="qrCode"/> <result column="qr_code" jdbcType="VARCHAR" property="qrCode"/>
<result column="introduction" jdbcType="VARCHAR" property="introduction"/> <result column="introduction" jdbcType="VARCHAR" property="introduction"/>
<result column="action_desc" jdbcType="VARCHAR" property="actionDesc"/> <result column="action_desc" jdbcType="VARCHAR" property="actionDesc"/>
<result column="is_del" property="isDel"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="talk_user_main" jdbcType="VARCHAR" property="talkUserMain"/>
<result column="talk_user_aux" jdbcType="VARCHAR" property="talkUserAux"/>


</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`,
`business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`, `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`,
`introduction`,`action_desc`,is_del
`introduction`,`action_desc`,`is_del`,
`talk_user_main`,`talk_user_aux`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Загрузка…
Отмена
Сохранить