diff --git a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsQuery.java b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsQuery.java index 010dcdf..48bb2f2 100644 --- a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsQuery.java +++ b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsQuery.java @@ -18,4 +18,5 @@ public class TransferRecordsQuery implements Query { private String bankSid; private String bankName; private String serialNumber; + private String state; } diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java index df5b92a..e816998 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java @@ -33,4 +33,5 @@ public interface TransferRecordsMapper extends BaseMapper { List selByOrderSids(String orderSid); IPage orderListByUserSid(IPage page, @Param("query") TransferRecordsQuery query); + IPage orderListByUserSid1(IPage page, @Param("query") TransferRecordsQuery query); } diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml index efe6b7f..39bc128 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml @@ -19,7 +19,10 @@ transfer_records WHERE customerSid=#{query.customerSid} - UNION + + + + - \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java index 99f4a7b..25e47e4 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -71,8 +72,13 @@ public class TransferRecordsService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("o.customerSid", query.getCustomerSid()); IPage page = PagerUtil.queryToPage(pq); + IPage pagging =new Page<>(); + if(query.getState().equals("1")){ + pagging = baseMapper.orderListByUserSid(page, query); + }else{ + pagging = baseMapper.orderListByUserSid1(page, query); + } - IPage pagging = baseMapper.orderListByUserSid(page, query); List goodsVo = new ArrayList<>(); for(TransferRecordsVo vo:pagging.getRecords()){ List goods =transferRecordsGoodsDetailsService.selByOrderSids(vo.getSid());