Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java

@@ -30,7 +30,7 @@ public interface TbShopUserFlowMapper extends BaseMapper<TbShopUserFlow> {
             "    LEFT JOIN ( " +
             "        SELECT shop_user_id, SUM(amount) AS total_amount  " +
             "        FROM tb_shop_user_flow  " +
-            "        WHERE biz_code IN ('cashMemberIn','scanMemberIn', 'scanMemberAwardIn')  " +
+            "        WHERE biz_code IN ('cashMemberIn', 'inMoneyIn', 'scanMemberIn')  " +
             "        AND create_time BETWEEN #{startTime} AND #{endTime}  " +
             "        GROUP BY shop_user_id " +
             "    ) AS flow ON flow.shop_user_id = a.id " +

eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java

@@ -17,7 +17,7 @@ import java.util.List;
 **/
 public interface TbShopTableRepository extends JpaRepository<TbShopTable, Integer>, JpaSpecificationExecutor<TbShopTable> {
 
-    @Query
+    @Query("select count(1) from TbShopTable table where table.shopId = :shopId")
     int countAllByShopId(@Param("shopId")Integer shopId);
 
     @Query("select table from TbShopTable table where table.qrcode = :qrcode")