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

//coupon

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
c171ecbfe6
2 измененных файлов: 1 добавлений и 11 удалений
  1. +0
    -10
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

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

@@ -241,16 +241,6 @@ public class WxCouponController extends BaseController {
} }


wxCoupon.updateTenantInfo(getTenantInfo()); wxCoupon.updateTenantInfo(getTenantInfo());
if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){
WxCouponChannel query = new WxCouponChannel();
query.updateTenantInfo(wxCoupon);
query.setCouponId(wxCoupon.getId());
query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
if (CollectionUtils.isNotEmpty(wxCouponChannelService.findList(query))) {
return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。");
}
}

WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId()); WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId());
if (null == coupon) { if (null == coupon) {
return new ResultData(ResultData.ERROR, "券未查询到。"+wxCoupon.getId()); return new ResultData(ResultData.ERROR, "券未查询到。"+wxCoupon.getId());


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

@@ -448,6 +448,7 @@ public class WxCouponServiceImpl implements WxCouponService {


final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
if (record.getId() == null) { if (record.getId() == null) {
record.setId(idWorker.nextId());


List<WxCouponMerchantDto> wxCouponMerchantDtoList = new ArrayList<>(); List<WxCouponMerchantDto> wxCouponMerchantDtoList = new ArrayList<>();
merchantParamList.forEach(merchantParam -> { merchantParamList.forEach(merchantParam -> {
@@ -479,7 +480,6 @@ public class WxCouponServiceImpl implements WxCouponService {
couponPasswordService.mkPasswords(record, record.getId(), record.getInventory()); couponPasswordService.mkPasswords(record, record.getId(), record.getInventory());
} }


record.setId(idWorker.nextId());
record.setCreateDate(new Date()); record.setCreateDate(new Date());
record.setUpdateDate(new Date()); record.setUpdateDate(new Date());
wxCouponMapper.insert(record); wxCouponMapper.insert(record);


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