秒杀订单

ruoyi-api/src/main/java/com/ruoyi/api/controller/business/ApiBusinessController.java

@@ -71,6 +71,16 @@ public class ApiBusinessController extends AbstractApiController {
         return R.ok(iBusinessService.queryList(bo));
     }
 
+    /**
+     * 分页商家列表
+     */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
+    @ApiOperation("分页商家列表")
+    @GetMapping("/page")
+    public TableDataInfo<BusinessVo> page(@Validated(QueryGroup.class) BusinessBo bo, PageQuery pageQuery) {
+        return iBusinessService.queryPageList(bo, pageQuery);
+    }
+
     /**
      * 查自己名下的商家
      */

ruoyi-shop/src/main/resources/mapper/usershoppingcart/UserShoppingCartMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                            on tpsss.business_id = tusc.business_id and
                               tpsss.product_id = tusc.product_id and
                               tpsss.sku_hash_code = tusc.sku_hash_code
+                            and tpsss.marketing_type = 0 and tpsss.activity_product_id = 0
         where tusc.user_id = #{bo.userId}
         <if test="bo.businessId != null">
             and tusc.business_id = #{bo.businessId}