1/21

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

src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java

@@ -33,4 +33,5 @@ public interface TransferRecordsMapper extends BaseMapper<TransferRecords> {
     List<TransferRecords> selByOrderSids(String orderSid);
 
     IPage<TransferRecordsVo> orderListByUserSid(IPage<TransferRecords> page, @Param("query") TransferRecordsQuery query);
+    IPage<TransferRecordsVo> orderListByUserSid1(IPage<TransferRecords> page, @Param("query") TransferRecordsQuery query);
 }

src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml

@@ -19,7 +19,10 @@
         transfer_records
         WHERE
         customerSid=#{query.customerSid}
-        UNION
+
+
+    </select>
+    <select id="orderListByUserSid1" resultType="com.yxt.yythmall.api.transferrecords.TransferRecordsVo">
         SELECT
             sid,
             '领取' as type,
@@ -37,5 +40,4 @@
 
     </select>
 
-
 </mapper>

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<TransferRecordsMa
         QueryWrapper<VegeCellarReserveOrder> qw = new QueryWrapper<>();
         qw.eq("o.customerSid", query.getCustomerSid());
         IPage<TransferRecords> page = PagerUtil.queryToPage(pq);
+        IPage<TransferRecordsVo> pagging =new Page<>();
+        if(query.getState().equals("1")){
+            pagging = baseMapper.orderListByUserSid(page, query);
+        }else{
+            pagging = baseMapper.orderListByUserSid1(page, query);
+        }
 
-        IPage<TransferRecordsVo> pagging = baseMapper.orderListByUserSid(page, query);
         List<OrderGoodsVo> goodsVo = new ArrayList<>();
         for(TransferRecordsVo vo:pagging.getRecords()){
             List<TransferRecordsGoodsDetails> goods =transferRecordsGoodsDetailsService.selByOrderSids(vo.getSid());