diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java index be15cd4..1b1e90a 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java @@ -149,7 +149,7 @@ public class GlobalExceptionHandler { public R handleException(Exception e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生系统异常.", requestURI, e); - return R.fail(e.getMessage()); + return R.fail("网络异常,请稍后重试"); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/AppProductOrderExpressController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/AppProductOrderExpressController.java index c63d985..2befe8d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/AppProductOrderExpressController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/AppProductOrderExpressController.java @@ -78,6 +78,7 @@ public class AppProductOrderExpressController extends BaseController { public R querySpeed(@Validated(AddGroup.class) ProductOrderExpressBo bo) { return R.ok(productOrderExpressApi.querySpeed(bo)); } + /** * 根据orderId 快递订单好查询记录 * @param expressNo diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAppBusinessProductController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAppBusinessProductController.java index 7aed406..a5a2167 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAppBusinessProductController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAppBusinessProductController.java @@ -112,6 +112,19 @@ public class SysAppBusinessProductController extends BaseController { return toAjax(appBusinessProductService.updateByBo(bo)); } + + /** + * 商品排序 + * 权限system:businessProduct:editSort + */ + @SaCheckPermission("system:businessProduct:editSort") + @Log(title = "商家商品", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("editSortBatch") + public R editSortBatch(@RequestBody ProductSortBo bo) { + return toAjax(appBusinessProductService.editSortBatch(bo)); + } + /** * 删除商家商品 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ProductOrderBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ProductOrderBo.java index 40a95a5..03279f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ProductOrderBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ProductOrderBo.java @@ -179,5 +179,14 @@ public class ProductOrderBo extends BaseEntity { private String showUser; private String showBusiness; + /** + * 关键字 + */ + private String keyworkds; + + /** + * 0无结算 1待结算 2已结算, 3无法结算 + */ + private Long settlement; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ProductSortBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ProductSortBo.java new file mode 100644 index 0000000..79a0d94 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ProductSortBo.java @@ -0,0 +1,14 @@ +package org.dromara.system.domain.bo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.List; + +@Data +public class ProductSortBo { + @NotNull + private List ids; + @NotNull + private Long sort; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAppBusinessProductService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAppBusinessProductService.java index 21714cc..35010eb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAppBusinessProductService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAppBusinessProductService.java @@ -195,4 +195,6 @@ public interface IAppBusinessProductService { int subStockMoreZero(Long productId, Long num); int offForceShelf(ProductOffShelfBo bo); + + int editSortBatch(ProductSortBo bo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AppBusinessProductServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AppBusinessProductServiceImpl.java index 2854162..d018a3c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AppBusinessProductServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AppBusinessProductServiceImpl.java @@ -657,6 +657,16 @@ public class AppBusinessProductServiceImpl implements IAppBusinessProductService return baseMapper.update(updateWrapper); } + @Override + @Transactional + public int editSortBatch(ProductSortBo bo) { + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",bo.getIds()) + .eq("sort", bo.getSort()); + return baseMapper.update(updateWrapper); + } + /** * 获取商品属性 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ProductOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ProductOrderServiceImpl.java index 840414c..ce43058 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ProductOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ProductOrderServiceImpl.java @@ -189,7 +189,6 @@ public class ProductOrderServiceImpl implements IProductOrderService { for (ProductOrderVo record : result.getRecords()) { record.setItemsList(productOrderItemsService.queryList(new ProductOrderItemsBo(record.getId()))); record.setProductOrderPriceVo(productOrderPriceService.queryById(record.getId())); - } return TableDataInfo.build(result); } @@ -257,8 +256,10 @@ public class ProductOrderServiceImpl implements IProductOrderService { lqw.eq(StringUtils.isNotBlank(bo.getMobile()), ProductOrder::getMobile, bo.getMobile()); lqw.eq(bo.getType() != null, ProductOrder::getType, bo.getType()); lqw.eq(bo.getNum() != null, ProductOrder::getNum, bo.getNum()); + lqw.eq(bo.getSettlement() != null, ProductOrder::getSettlement, bo.getSettlement()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ProductOrder::getStatus, bo.getStatus()); lqw.eq(StringUtils.isNotBlank(bo.getShowBusiness()), ProductOrder::getShowBusiness, bo.getShowBusiness()); + lqw.apply(StringUtils.isNotBlank(bo.getKeyworkds()), "locate({0}, order_no) > 0 or locate({0}, mobile) > 0 or locate({0}, product_name) > 0 ", bo.getKeyworkds()); return lqw; }