cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

账单明细接口优化

Browse Source
This commit is contained in:
hupeng
2020-04-13 17:07:37 +08:00
parent 4f22e2a9f8
commit 32bf13c531
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java
View File

@ -10,6 +10,7 @@ package co.yixiang.modules.user.web.controller;
import cn.hutool.core.img.ImgUtil; import cn.hutool.core.img.ImgUtil;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.extra.qrcode.QrCodeUtil;
@ -325,10 +326,12 @@ public class UserBillController extends BaseController {
@GetMapping("/spread/commission/{type}") @GetMapping("/spread/commission/{type}")
@ApiOperation(value = "推广佣金明细",notes = "推广佣金明细") @ApiOperation(value = "推广佣金明细",notes = "推广佣金明细")
public ApiResult<Object> spreadCommission(YxUserBillQueryParam queryParam, public ApiResult<Object> spreadCommission(YxUserBillQueryParam queryParam,
@PathVariable int type){ @PathVariable String type){
int newType = 0;
if(NumberUtil.isNumber(type)) newType = Integer.valueOf(type);
int uid = SecurityUtils.getUserId().intValue(); int uid = SecurityUtils.getUserId().intValue();
return ApiResult.ok(userBillService.getUserBillList(queryParam.getPage().intValue(), return ApiResult.ok(userBillService.getUserBillList(queryParam.getPage().intValue(),
queryParam.getLimit().intValue(),uid,type)); queryParam.getLimit().intValue(),uid,newType));
} }

1
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java
View File

@ -103,6 +103,7 @@ public class SystemStoreController {
@PreAuthorize("@el.check('yxSystemStore:del')") @PreAuthorize("@el.check('yxSystemStore:del')")
@DeleteMapping @DeleteMapping
public ResponseEntity<Object> deleteAll(@RequestBody Integer[] ids) { public ResponseEntity<Object> deleteAll(@RequestBody Integer[] ids) {
//if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作");
yxSystemStoreService.deleteAll(ids); yxSystemStoreService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }