소스 검색

修复积分导出问题

zhangxin 3 주 전
부모
커밋
8a1258c8ae
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsRechargeServiceImpl.java

+ 3 - 3
yami-shop-service/src/main/java/com/yami/shop/service/impl/PointsRechargeServiceImpl.java

@@ -230,7 +230,7 @@ public class PointsRechargeServiceImpl extends ServiceImpl<PointsRechargeMapper,
     @Override
     public void export(PointsRecharge pointsRecharge, HttpServletResponse response) {
         List<PointsRecharge> enterpriseUserVos= pointsRechargeMapper.selectList(new LambdaQueryWrapper<PointsRecharge>()
-                .in(PointsRecharge::getChannelId,pointsRecharge.getChannelIdList())
+                .in(ObjectUtils.isNotEmpty(pointsRecharge.getChannelIdList()),PointsRecharge::getChannelId,pointsRecharge.getChannelIdList())
                 .eq(ObjectUtils.isNotEmpty(pointsRecharge.getUserPhone()),PointsRecharge::getUserPhone,pointsRecharge.getUserPhone())
                 .orderByDesc(PointsRecharge::getCreateTime));
         if (enterpriseUserVos.isEmpty()){
@@ -338,9 +338,9 @@ public class PointsRechargeServiceImpl extends ServiceImpl<PointsRechargeMapper,
         ExportUtils.createCell(sheet,row, 4,0,0,orderRefundVo.getPoints(), numberStyle);
 
         // 过期时间
-        ExportUtils.createCell(sheet,row, 5,0,0, ExportUtils.formatDate(orderRefundVo.getCreateTime()), dateStyle);
+        ExportUtils.createCell(sheet,row, 5,0,0, ExportUtils.formatDate(orderRefundVo.getExpiryDate()), dateStyle);
         // 创建时间
-        ExportUtils.createCell(sheet,row, 6,0,0, ExportUtils.formatDate(orderRefundVo.getExpiryDate()), dateStyle);
+        ExportUtils.createCell(sheet,row, 6,0,0, ExportUtils.formatDate(orderRefundVo.getCreateTime()), dateStyle);
 
     }
 }