仓库订单列表添加规则 品牌及仓库传0为查询全部

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/controller/KxsStatUserController.java

@@ -55,5 +55,7 @@ public class KxsStatUserController {
     }
 
 
+
+
 }
 

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsMachineApplyMapper.xml

@@ -31,10 +31,10 @@
     <select id="getByPage" resultType="com.kxs.store.api.vo.kxsapp.storeOrder.StoreOrderListVO">
         select a.id, a.create_time, a.order_sn, a.get_mode, a.apply_num, a.contacts, a.phone, a.address, a.apply_type, a.status, a.username, a.user_code from kxs_machine_apply a
         <where>
-            <if test="query.brandId != null">
+            <if test="query.brandId != null and query.brandId != 0">
                 and a.brand_id = #{query.brandId}
             </if>
-            <if test="query.warehouseId != null">
+            <if test="query.warehouseId != null and query.brandId != 0">
                 and a.warehouse_id = #{query.warehouseId}
             </if>
             <if test="query.status != null">

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsUserAmountLogService.java

@@ -30,6 +30,7 @@ public interface KxsUserAmountLogService extends IService<KxsUserAmountLog> {
      *
      * @param tradeMonth 月份
      * @return {@link AmountInExpendTotalVO}
+
      */
     AmountInExpendTotalVO amountInExpendTotal(String tradeMonth);