czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
SongZhang 2024-08-23 10:47:48 +08:00
parent 8381287036 112206d2ec
commit ce54b66205
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java
View File

@ -2,6 +2,7 @@ package cn.ysk.cashier.mybatis.rest;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.domain.QiniuContent; import cn.ysk.cashier.domain.QiniuContent;
import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.exception.BadRequestException;
import cn.ysk.cashier.mybatis.entity.Activate; import cn.ysk.cashier.mybatis.entity.Activate;
@ -46,6 +47,8 @@ public class StorageController {
String userName = SecurityUtils.getCurrentUsername(); String userName = SecurityUtils.getCurrentUsername();
return new ResponseEntity<>(shopService.findActivate(shopId), HttpStatus.OK); return new ResponseEntity<>(shopService.findActivate(shopId), HttpStatus.OK);
} }
@Log("修改活动数据")
@PostMapping("/modityActivate") @PostMapping("/modityActivate")
public ResponseEntity<Object> modityActivate(@RequestBody Activate activate){ public ResponseEntity<Object> modityActivate(@RequestBody Activate activate){
if (activate.getIsGiftPro() != null && activate.getIsGiftPro() == 1 && CollectionUtils.isEmpty(activate.getProducts())) if (activate.getIsGiftPro() != null && activate.getIsGiftPro() == 1 && CollectionUtils.isEmpty(activate.getProducts()))

5
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java
View File

@ -9,6 +9,7 @@ import cn.ysk.cashier.pojo.product.TbProduct;
import cn.ysk.cashier.pojo.product.TbProductSku; import cn.ysk.cashier.pojo.product.TbProductSku;
import cn.ysk.cashier.pojo.shop.TbMerchantAccount; import cn.ysk.cashier.pojo.shop.TbMerchantAccount;
import cn.ysk.cashier.repository.product.TbProductRepository; import cn.ysk.cashier.repository.product.TbProductRepository;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -151,6 +152,10 @@ public class ShopServiceImpl implements ShopService {
} }
} }
actProductService.saveOrUpdateBatch(activate.getProducts()); actProductService.saveOrUpdateBatch(activate.getProducts());
}else {
LambdaQueryWrapper<TbActivateProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbActivateProduct::getActivateId, activate.getId()); // 条件：年龄等于30
actProductService.remove(queryWrapper);
} }
} }