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

Merge branch 'ww' into test

Browse Source
This commit is contained in:
wangw
2024-08-23 10:39:47 +08:00
parent 52dce24fb8 16f07f2f40
commit 112206d2ec
1 changed files with 3 additions and 0 deletions
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()))