puzhibing
2024-09-12 a3f603cd76de9dbeb6fcc35cad1ada9cf2682fb7
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

# Conflicts:
# ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
1个文件已修改
8 ■■■■ 已修改文件
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -73,11 +73,17 @@
    @Override
    public List<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
        List<Integer> integers = new ArrayList<>();
        integers.add(1);
        integers.add(2);
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        QueryWrapper<TAppCoupon> wrapper = new QueryWrapper<>();
        wrapper.eq("coupon_id",dto.getCouponId());
        wrapper.in("ways_to_obtain",integers);
        if (dto.getStatus()!=null){
            wrapper.eq("status",dto.getStatus());
        }
        List<TAppCoupon> tAppCoupons = this.baseMapper.selectList(wrapper);
        List<ExchangeRecordVO> list = new ArrayList<>();
        // 订单ids
        StringBuilder stringBuilder = new StringBuilder();