fix:修复结算单查询品牌失效

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java

@@ -167,5 +167,10 @@ public class MerchantStatisticsDTO implements Serializable {
 	 */
 	private List<Long> warehouseIds;
 
+	/**
+	 * 品牌
+	 */
+	private String brand;
+
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml

@@ -129,6 +129,10 @@
         <if test="param.payWay != null and param.payWay != '' ">
             and lww.pay_way = #{param.payWay}
         </if>
+        <if test="param.brand != null and param.brand != ''">
+            and lsoi.brand = #{param.brand}
+        </if>
+
         and lsoi.destination_warehouse_id in
         <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
             #{item}
@@ -686,6 +690,9 @@
         <if test="param.listType == 1">
             and lsoi.type_service != '2'
         </if>
+        <if test="param.brand != null and param.brand != '' ">
+            and lsoi.brand = #{param.brand}
+        </if>
         <if test="param.listType == 2">
             and lsoi.type_service = '2'
         </if>