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

Merge branch 'develop' of https://git.youlane.cn/server/formallProject into develop

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
b6c3f9d38e
3 измененных файлов: 1 добавлений и 9 удалений
  1. +0
    -3
      mallinkAdmin/src/main/resources/db/migration/V201910141400__L_COUPON.sql
  2. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  3. +1
    -3
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

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

@@ -1,3 +0,0 @@
alter table wx_coupon
add column `score_price` BIGINT (12) NULL DEFAULT 0 COMMENT '积分售价';


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

@@ -204,9 +204,6 @@ public class WxCoupon extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private Integer pressSuccCount; private Integer pressSuccCount;


@io.swagger.annotations.ApiModelProperty(value = "积分售价", name = "scorePrice")
private Long scorePrice;

@io.swagger.annotations.ApiModelProperty(value = "过滤可投放0不过滤 1过滤", name = "filterCanPut") @io.swagger.annotations.ApiModelProperty(value = "过滤可投放0不过滤 1过滤", name = "filterCanPut")
@TableField(exist = false) @TableField(exist = false)
private Integer filterCanPut; private Integer filterCanPut;


+ 1
- 3
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -44,7 +44,6 @@
<result column="conditions" jdbcType="VARCHAR" property="conditions"/> <result column="conditions" jdbcType="VARCHAR" property="conditions"/>
<result column="approval_type" property="approvalType"/> <result column="approval_type" property="approvalType"/>
<result column="password_support" property="passwordSupport"/> <result column="password_support" property="passwordSupport"/>
<result column="score_price" property="scorePrice"/>


</resultMap> </resultMap>
<resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo"> <resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo">
@@ -91,14 +90,13 @@
<result column="sum_subsidy" property="sumSubsidy"/> <result column="sum_subsidy" property="sumSubsidy"/>
<result column="payment_rate" property="paymentRate"/> <result column="payment_rate" property="paymentRate"/>
<result column="change_rate" property="changeRate"/> <result column="change_rate" property="changeRate"/>
<result column="score_price" property="scorePrice"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`, `id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,
`remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`, `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,`put_apply_status`,`stock_apply_status`,`cancle_apply_status`,`conditions`,approval_type,score_price
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,`put_apply_status`,`stock_apply_status`,`cancle_apply_status`,`conditions`,approval_type
</sql> </sql>


<sql id="statusColumns"> <sql id="statusColumns">


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