商家结算卡信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessController.java

@@ -357,7 +357,7 @@ public class BusinessController extends BaseController {
     }
 
     @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
-    @ApiOperation("根据连锁店查连锁店")
+    @ApiOperation("查能迁移的连锁店")
     @SaCheckPermission("business:business:chainPage")
     @GetMapping("/chainPage")
     public TableDataInfo<BusinessVo> chainPage(@Validated(QueryGroup.class) BusinessBo bo, PageQuery pageQuery) {

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

@@ -68,8 +68,8 @@ public class ApiBusinessDayBillController extends AbstractApiController {
      * 导出商家日账单列表
      */
     @ApiOperation("导出商家日账单列表")
-    @PostMapping("/export")
-    public void export(@Validated @RequestBody BusinessDayBillBo bo, HttpServletResponse response) {
+    @GetMapping("/export")
+    public void export(@Validated BusinessDayBillBo bo, HttpServletResponse response) {
         if (ObjectUtil.isNull(bo.getBusinessId())) {
             bo.setBusinessId(getBusinessByUserId(getUserId(true), true));
         }

ruoyi-shop/src/main/resources/mapper/product/ProductMapper.xml

@@ -144,6 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
                 )
             </if>
+            <if test="bo.productUseType != null">
+                and tp.product_use_type = #{bo.productUseType.code}
+            </if>
         </where>
         <if test="bo.orderType==1">
             ORDER BY tp.recommend_status DESC,tp.show_sales desc,tp.`create_time` ASC