zhangxin 2 недель назад
Родитель
Сommit
0c8428f567

+ 1 - 1
yami-shop-security/yami-shop-security-platform/src/main/java/com/yami/shop/security/platform/config/ResourceServerConfiguration.java

@@ -64,7 +64,7 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
                     "/admin/enterprise/downloadXlsx",
                     "/admin/enterprise/downloadExcel",
                     "/admin/enterprise/downloadErrorExcel",
-
+                    "/admin/enterprise/export",
                     "/captcha.jpg").permitAll()
             .and()
             .authorizeRequests()

+ 2 - 1
yami-shop-service/src/main/java/com/yami/shop/dao/PointsRechargeMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yami.shop.bean.model.PointsRecharge;
 import com.yami.shop.bean.vo.PointsRechargeVO;
 import com.yami.shop.common.util.PageParam;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,5 +21,5 @@ public interface PointsRechargeMapper extends BaseMapper<PointsRecharge> {
      * @param pointsRecharge 查询参数
      * @return 积分充值统计列表
      */
-    List<PointsRechargeVO> statisticsList(PointsRecharge pointsRecharge);
+    List<PointsRechargeVO> statisticsList(@Param("pointsRecharge") PointsRecharge pointsRecharge);
 }

+ 7 - 1
yami-shop-service/src/main/resources/mapper/PointsRechargeMapper.xml

@@ -10,7 +10,13 @@
         max(create_time) AS createTime
         FROM tz_points_recharge
         <where>
-              <if test="channelId != null"> channel_id = #{channelId}</if>
+              <if test="pointsRecharge.channelId != null"> channel_id = #{pointsRecharge.channelId}</if>
+            <if test="pointsRecharge.channelIdList != null and !pointsRecharge.channelIdList.isEmpty()">
+                and channel_id  in
+                <foreach collection="pointsRecharge.channelIdList" item="channelId" open="(" close=")" separator=",">
+                    #{channelId}
+                </foreach>
+            </if>
         </where>
         GROUP BY channel_id, channel_name
         ORDER BY max(create_time) DESC