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

[C端首页][修改][切换砍价和拼团]

release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
87c280ec48
2 измененных файлов: 7 добавлений и 1 удалений
  1. +4
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java

+ 4
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller; package com.iformall.controller;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponChannelVo;
@@ -102,6 +103,9 @@ public class WxCouponChannelController extends BaseController {
public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) { public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) {
if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel();
wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setTenantId(getTenantId());
if (wxCouponChannel.getCouponId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空");
}
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC);


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java Просмотреть файл

@@ -138,7 +138,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {


@Override @Override
public WxCouponChannelVo change(WxCouponChannel record) { public WxCouponChannelVo change(WxCouponChannel record) {
return wxCouponChannelMapper.findVoList(record).parallelStream().findAny().orElseGet(null);
return wxCouponChannelMapper.findVoList(record).parallelStream()
.filter(wxCouponChannelVo -> !wxCouponChannelVo.getCouponId().equals(record.getCouponId()))
.findAny().orElseGet(null);
} }


private boolean isCouponMerchantValid(Long couponId) { private boolean isCouponMerchantValid(Long couponId) {


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