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

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

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

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

@@ -1,29 +1,29 @@
package com.iformall.controller;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponChannelActivityStatus;
import com.iformall.enums.EnumCouponChannelStatus;
import com.iformall.enums.EnumCouponChannelType;
import com.iformall.enums.EnumCouponStatus;
import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxMerchantService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import com.iformall.common.ResultData;

import com.iformall.domain.po.WxCouponChannel;
import com.iformall.service.WxCouponChannelService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Date;
import java.util.Map;
@@ -103,9 +103,6 @@ public class WxCouponChannelController extends BaseController {
public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) {
if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel();
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.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC);


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

@@ -142,8 +142,14 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {

@Override
public WxCouponChannelVo change(WxCouponChannel record) {
Long couponId = 0L;
if (record.getCouponId() != null) {
couponId = record.getCouponId();
record.setCouponId(null);
}
Long finalCouponId = couponId;
return wxCouponChannelMapper.findVoList(record).parallelStream()
.filter(wxCouponChannelVo -> !wxCouponChannelVo.getCouponId().equals(record.getCouponId()))
.filter(wxCouponChannelVo -> !wxCouponChannelVo.getCouponId().equals(finalCouponId))
.findAny().orElse(null);
}



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