liu 11 kuukautta sitten
vanhempi
commit
a8ac8b6db8

+ 1 - 10
src/main/java/com/sqx/modules/errand/service/impl/TbIndentServiceImpl.java

@@ -1990,19 +1990,10 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
 
     @Override
     public PageUtils selectIndentPage(Integer page, Integer limit, String acquireCode, Long userId) {
-//        2:已支付3:骑手已接单4:骑手已取货/购买
-        List<Integer> states = new ArrayList<>();
-        states.add(2);
-        states.add(3);
-        states.add(4);
         IPage<TbIndent> pages = new Page<>(page, limit);
         QueryWrapper<TbIndent> queryWrapper = new QueryWrapper();
-        queryWrapper.like(StrUtil.isNotBlank(acquireCode), "order_id", acquireCode);
-        queryWrapper.in("indent_state", states);
-        queryWrapper.and(qw -> qw.isNull("rider_user_id").or().eq("rider_user_id", userId));
-        queryWrapper.orderByAsc("create_time");
+        queryWrapper.eq("order_id", acquireCode);
         IPage<TbIndent> result = baseMapper.selectPage(pages, queryWrapper);
-
         return new PageUtils(result);
     }
 

+ 6 - 0
src/main/java/com/sqx/modules/order/service/AppOrderService.java

@@ -187,4 +187,10 @@ public interface AppOrderService extends IService<TbOrder> {
 
     List<TbOrder> changeTimeOutOrder(long time);
 
+    /**
+     * 查询商品sku销售数量
+     * @param query 查询参数
+     * @return 商品sku销售数量
+     */
+    PageUtils getGoodsSkuSalesCount(GoodsSkuQuery query);
 }

+ 8 - 0
src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -2946,6 +2946,14 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         return appOrderDao.changeTimeOutOrder(time);
     }
 
+    @Override
+    public PageUtils getGoodsSkuSalesCount(GoodsSkuQuery query) {
+        Page<GoodsSkuSalesCountVO> pages = new Page<>(query.getPage(), query.getLimit());
+
+        IPage<GoodsSkuSalesCountVO> page = baseMapper.getGoodsSkuSalesCount(pages, query);
+        PageUtils pageUtils = new PageUtils(page);
+        return pageUtils;
+    }
 
     /**
      * 更新订单状态和支付顺序