商品排序和订单调整

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java

@@ -149,7 +149,7 @@ public class GlobalExceptionHandler {
     public R<Void> handleException(Exception e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生系统异常.", requestURI, e);
-        return R.fail(e.getMessage());
+        return R.fail("网络异常,请稍后重试");
     }
 
     /**

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<JSONArray> querySpeed(@Validated(AddGroup.class)  ProductOrderExpressBo bo) {
         return R.ok(productOrderExpressApi.querySpeed(bo));
     }
+
     /**
      * 根据orderId 快递订单好查询记录
      * @param expressNo

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<Void> editSortBatch(@RequestBody ProductSortBo bo) {
+        return toAjax(appBusinessProductService.editSortBatch(bo));
+    }
+
     /**
      * 删除商家商品
      *

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;
 
 }

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<Long> ids;
+    @NotNull
+    private Long sort;
+}

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);
 }

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<AppBusinessProduct> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",bo.getIds())
+            .eq("sort", bo.getSort());
+        return    baseMapper.update(updateWrapper);
+    }
+
 
     /**
      * 获取商品属性

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;
     }