Explorar el Código

[积分][修改][bug1002015]

release_toaliyun_real
luozukai hace 6 años
padre
commit
73f45096f1
Se han modificado 2 ficheros con 4 adiciones y 1 borrados
  1. +3
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java

+ 3
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Ver fichero

@@ -6,6 +6,7 @@ import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponChannelActivityStatus; import com.iformall.enums.EnumCouponChannelActivityStatus;
import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponChannelStatus;
import com.iformall.enums.EnumCouponChannelType; import com.iformall.enums.EnumCouponChannelType;
import com.iformall.enums.EnumCouponStatus;
import com.iformall.service.WxMerchantService; import com.iformall.service.WxMerchantService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.HashedMap;
@@ -47,6 +48,8 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setTenantId(getTenantId());
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC, WxCouponChannel.Field.Id_DESC); wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC, WxCouponChannel.Field.Id_DESC);
//过滤已作废
wxCouponChannel.setStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());


PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page); filterTimed(wxCouponChannel, page);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java Ver fichero

@@ -36,7 +36,7 @@ public interface WxCreditHistoryService {
*/ */
WxCreditHistory getById(Long id); WxCreditHistory getById(Long id);
/**
/**
* 保存或更新实体 * 保存或更新实体
* *
* @param record * @param record


Cargando…
Cancelar
Guardar