diff --git a/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java b/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java index bab3d16..d9ee2d2 100644 --- a/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java +++ b/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java @@ -107,12 +107,15 @@ public class CustomMadeInfoController extends BladeController { * 分页 */ @GetMapping("/list") - public R> list(Query query, String orderNo, String username, String phone, String pillowMaterial, + public R> list(Query query, String orderNo, String purchaseChannel, String username, String phone, String pillowMaterial, String pillowHardness, String ageRange, String startTime, String endTime) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); if (Func.isNotEmpty(orderNo)) { wrapper.like(CustomMadeInfo::getOrderNo, orderNo); } + if (Func.isNotEmpty(purchaseChannel)) { + wrapper.like(CustomMadeInfo::getPurchaseChannel, purchaseChannel); + } if (Func.isNotEmpty(username)) { wrapper.like(CustomMadeInfo::getUsername, username); } @@ -143,12 +146,15 @@ public class CustomMadeInfoController extends BladeController { * 导出 */ @GetMapping("/export") - public void export(HttpServletResponse response, String orderNo, String username, String phone, String pillowMaterial, + public void export(HttpServletResponse response, String orderNo, String purchaseChannel, String username, String phone, String pillowMaterial, String pillowHardness, String ageRange, String startTime, String endTime) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); if (Func.isNotEmpty(orderNo)) { wrapper.like(CustomMadeInfo::getOrderNo, orderNo); } + if (Func.isNotEmpty(purchaseChannel)) { + wrapper.like(CustomMadeInfo::getPurchaseChannel, purchaseChannel); + } if (Func.isNotEmpty(username)) { wrapper.like(CustomMadeInfo::getUsername, username); } @@ -198,7 +204,7 @@ public class CustomMadeInfoController extends BladeController { int total = Func.toInt(iCustomMadeInfoService.count(wrapper)); info.setOrderNoSort(total + 1); } - return R.status(iCustomMadeInfoService.save(info)); + return R.status(iCustomMadeInfoService.saveOrUpdate(info)); } /**