瀏覽代碼

[卡密][修改]:消费卡频道不显示免费卡

release_toaliyun_real
Stormeye Wu 6 年之前
父節點
當前提交
306ef04320
共有 3 個檔案被更改,包括 0 行新增11 行删除
  1. +0
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +0
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
  3. +0
    -3
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml

+ 0
- 4
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java 查看文件

@@ -61,10 +61,6 @@ public class WxCouponChannelController extends BaseController {
if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) {
wxCouponChannel.setStatus(null); wxCouponChannel.setStatus(null);
} }
if (wxCouponChannel.getTargetAd() != null && wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode())) {
// 卡频道过滤掉免费卡
wxCouponChannel.setSendType(EnumCouponSendType.ACTIVE.getCode());
}
wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setTenantId(getTenantId());
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);


+ 0
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java 查看文件

@@ -73,10 +73,6 @@ public class WxCouponChannel extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice")
private Integer creditPrice; private Integer creditPrice;


@Transient
@io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放,用于卡购物频道",name="sendType")
private Integer sendType;

@Transient @Transient
@SortColumn(column = "sale_price") @SortColumn(column = "sale_price")
private String salePriceStr; private String salePriceStr;


+ 0
- 3
mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml 查看文件

@@ -25,9 +25,6 @@


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
where 1=1 where 1=1
<if test="null != sendType">
and c.send_type = #{sendType}
</if>
<if test="null != couponStatus"> <if test="null != couponStatus">
and c.status = #{couponStatus} and c.status = #{couponStatus}
</if> </if>


Loading…
取消
儲存