|
|
@@ -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);
|
|
|
|
|
|
}
|
|
|
}
|