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

[商户][修改]:商户添加优惠活动

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

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

@@ -0,0 +1,2 @@
ALTER TABLE `wx_merchant`
ADD COLUMN `action_desc` VARCHAR(2048) NULL DEFAULT NULL AFTER `introduction`;

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

@@ -169,6 +169,9 @@ public class WxMerchant extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="简介",name="introduction")
private String introduction;

@io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc")
private String actionDesc;

@Transient
private WxProfitSharingReceiver wxProfitSharingReceiver;



+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java Просмотреть файл

@@ -78,4 +78,7 @@ public class WxMerchantVo {
@io.swagger.annotations.ApiModelProperty(value="简介",name="introduction")
private String introduction;

@io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc")
private String actionDesc;

}

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

@@ -26,11 +26,13 @@
<result column="bill_setting" jdbcType="INTEGER" property="billSetting"/>
<result column="qr_code" jdbcType="VARCHAR" property="qrCode"/>
<result column="introduction" jdbcType="VARCHAR" property="introduction"/>
<result column="action_desc" jdbcType="VARCHAR" property="actionDesc"/>
</resultMap>

<sql id="allColumns">
`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`,`introduction`
`business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`,
`introduction`,`action_desc`
</sql>

<sql id="dynamicWhereConditions">
@@ -122,7 +124,7 @@
<sql id="allMerchantVoColumns">
m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id,
m.is_public,m.email,m.title,m.cover_picture,m.sub_business_id,
m.shop_type,m.introduction,bu.title as business_name
m.shop_type,m.introduction,m.action_desc,bu.title as business_name
</sql>
<select id="getMerchantByCode" parameterType="java.util.Map" resultMap="MerchantVoResultMap">
@@ -164,6 +166,7 @@
<result column="business_name" jdbcType="VARCHAR" property="businessName"/>

<result column="introduction" jdbcType="VARCHAR" property="introduction"/>
<result column="action_desc" jdbcType="VARCHAR" property="actionDesc"/>
<collection column="{merchantId=id}" property="shopVoList"
ofType="com.iformall.domain.vo.WxShopVo"


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