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

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

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
0cf96769c5
3 измененных файлов: 12 добавлений и 6 удалений
  1. +5
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
  3. +3
    -0
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml

+ 5
- 6
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Просмотреть файл

@@ -9,12 +9,8 @@ import com.iformall.controller.app.WxAppinfoController;
import com.iformall.controller.base.BaseController; import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.dto.WxCouponChannelDto;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxCouponChannelAddVo;
import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponChannelStatus;
import com.iformall.enums.EnumFlowRecordStatus;
import com.iformall.enums.EnumRentContractAppStatus;
import com.iformall.enums.EnumRentContractStatus;
import com.iformall.enums.*;
import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxCouponChannelMapper;
import com.iformall.service.QrCodeService; import com.iformall.service.QrCodeService;
import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponChannelService;
@@ -24,7 +20,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +61,10 @@ 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);


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

@@ -73,6 +73,10 @@ 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;


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

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


<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>


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