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

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

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

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

@@ -106,8 +106,7 @@ public class WxCouponChannelController extends BaseController {
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);
WxCouponChannelVo vo = wxCouponChannelService.change(wxCouponChannel);
return new ResultData(vo);
return wxCouponChannelService.change(wxCouponChannel);
} }






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

@@ -70,6 +70,6 @@ public interface WxCouponChannelService {


void updateStatusByCouponId(Long couponId,String tenantId,int status); void updateStatusByCouponId(Long couponId,String tenantId,int status);


WxCouponChannelVo change(WxCouponChannel wxCouponChannel);
ResultData change(WxCouponChannel wxCouponChannel);


} }

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxCouponChannel;
@@ -138,7 +139,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
} }


@Override @Override
public WxCouponChannelVo change(WxCouponChannel record) {
public ResultData change(WxCouponChannel record) {
Long couponId = 0L; Long couponId = 0L;
if (record.getCouponId() != null) { if (record.getCouponId() != null) {
couponId = record.getCouponId(); couponId = record.getCouponId();
@@ -146,10 +147,13 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
} }
List<WxCouponChannelVo> voList = wxCouponChannelMapper.findVoList(record); List<WxCouponChannelVo> voList = wxCouponChannelMapper.findVoList(record);
if (voList.isEmpty()) { if (voList.isEmpty()) {
return null;
return new ResultData(Result.SUCCESS, "查询成功", null);
} }
Map<String, Object> data = new HashMap<>();
if (voList.size() == 1) { if (voList.size() == 1) {
return voList.get(0);
data.put("size", 1);
data.put("data", voList.get(0));
return new ResultData(Result.SUCCESS, "查询成功", data);
} }
Long finalCouponId = couponId; Long finalCouponId = couponId;
voList = voList.stream() voList = voList.stream()
@@ -157,7 +161,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
.collect(Collectors.toList()); .collect(Collectors.toList());
int size = voList.size(); int size = voList.size();
Random random = new Random(); Random random = new Random();
return voList.get(random.nextInt(size));
data.put("size", size);
data.put("data", voList.get(random.nextInt(size)));
return new ResultData(Result.SUCCESS, "查询成功", data);
} }


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


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