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

update gift

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
c50ee173e6
2 измененных файлов: 6 добавлений и 2 удалений
  1. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

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

@@ -62,7 +62,7 @@ public class WxCouponController extends BaseController {
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "券投放-列表")
public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Integer dataType) {
public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Integer dataType,Boolean isList) {
logger.debug("[" + getIpAddr() + "] WxCouponController::list");
if (wxCoupon == null) wxCoupon = new WxCoupon();
if(null != dataType && dataType == 1){
@@ -88,11 +88,15 @@ public class WxCouponController extends BaseController {

wxCoupon.setTypes(Arrays.asList(typeArray));

}

if(!(isList == null?false:isList)){
Integer[] sendTypeArray = {
EnumCouponSendType.ACTIVE.getCode(),
EnumCouponSendType.PASSIVE.getCode(),};
wxCoupon.setSendTypes(Arrays.asList(sendTypeArray));
}

return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表
}



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

@@ -574,7 +574,7 @@
</if>

<if test=" null != sendTypes ">
and c.send_types in
and c.send_type in
<foreach collection="sendTypes" index="index" item="typesItem" open="(" separator="," close=")">
#{typesItem}
</foreach>


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