linweichao пре 1 недеља
родитељ
комит
fe71290b67

+ 16 - 0
qnfhq-api/src/main/java/com/qnfhq/modules/business/controller/TMingOrderController.java

@@ -2,6 +2,7 @@ package com.qnfhq.modules.business.controller;
 
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qnfhq.common.ApiBaseController;
 import com.qnfhq.common.utils.Result;
 import com.qnfhq.common.utils.StringUtils;
@@ -12,8 +13,13 @@ import com.qnfhq.modules.user.service.SettingService;
 import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 
@@ -36,6 +42,16 @@ public class TMingOrderController extends ApiBaseController
 
 
 
+    /**
+     * 查询挖矿订单列表
+     */
+    @PostMapping("/list")
+    public Result list(@RequestBody TMingOrder tMineOrder){
+        tMineOrder.setUserId(getStpUserId());
+        IPage<TMingOrder> tMingOrderIPage = itMingOrderService.selectTMingOrderList(tMineOrder);
+        return new Result().ok(tMingOrderIPage);
+    }
+
     @PostMapping("/submit")
      public Result submit(@RequestBody  TMingOrder mingOrder) {
         Result result = new Result();

+ 2 - 0
qnfhq-api/src/main/java/com/qnfhq/modules/business/service/ITMingOrderService.java

@@ -1,5 +1,6 @@
 package com.qnfhq.modules.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qnfhq.modules.business.entity.TMingOrder;
 
@@ -23,4 +24,5 @@ public interface ITMingOrderService extends IService<TMingOrder>
      */
     String bugMingOrder(Long planId, BigDecimal amount,Long userId);
 
+    IPage<TMingOrder> selectTMingOrderList(TMingOrder tMineOrder);
 }

+ 90 - 4
qnfhq-api/src/main/java/com/qnfhq/modules/business/service/impl/TMingOrderServiceImpl.java

@@ -4,9 +4,14 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.setting.Setting;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qnfhq.common.utils.DateUtil;
 import com.qnfhq.common.utils.MessageUtils;
+import com.qnfhq.common.utils.StringUtils;
+import com.qnfhq.modules.business.dao.TMingProductMapper;
 import com.qnfhq.modules.business.dao.TMingProductUserMapper;
 import com.qnfhq.modules.business.entity.AddMosaicSetting;
 import com.qnfhq.modules.business.entity.MingProduct;
@@ -30,12 +35,11 @@ import com.qnfhq.modules.user.service.SettingService;
 import com.qnfhq.utils.OrderUtils;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * mingService业务层处理
@@ -70,6 +74,9 @@ public class TMingOrderServiceImpl extends ServiceImpl<TMingOrderMapper, TMingOr
     @Resource
     private SettingService settingService;
 
+    @Resource
+    private TMingProductMapper tMingProductMapper;
+
 
     @Override
     public String bugMingOrder(Long planId, BigDecimal amount, Long userId) {
@@ -196,5 +203,84 @@ public class TMingOrderServiceImpl extends ServiceImpl<TMingOrderMapper, TMingOr
         }*/
         return "success";
     }
+
+    @Override
+    public IPage<TMingOrder> selectTMingOrderList(TMingOrder tMingOrder) {
+        // 构建分页对象(假设已定义)
+        IPage<TMingOrder> page = new Page<>(1, 20); // current: 当前页, size: 每页条数
+        // 构建查询条件
+        LambdaQueryWrapper<TMingOrder> queryWrapper = new LambdaQueryWrapper<>();
+        if (tMingOrder.getAmount() != null) {
+            queryWrapper.eq(TMingOrder::getAmount, tMingOrder.getAmount());
+        }
+        if (tMingOrder.getDays() != null) {
+            queryWrapper.eq(TMingOrder::getDays, tMingOrder.getDays());
+        }
+        if (tMingOrder.getStatus() != null) {
+            queryWrapper.eq(TMingOrder::getStatus, tMingOrder.getStatus());
+        }
+        if (tMingOrder.getPlanId() != null) {
+            queryWrapper.eq(TMingOrder::getPlanId, tMingOrder.getPlanId());
+        }
+        if (StringUtils.isNotBlank(tMingOrder.getPlanTitle())) {
+            queryWrapper.eq(TMingOrder::getPlanTitle, tMingOrder.getPlanTitle());
+        }
+        if (StringUtils.isNotBlank(tMingOrder.getOrderNo())) {
+            queryWrapper.eq(TMingOrder::getOrderNo, tMingOrder.getOrderNo());
+        }
+        if (tMingOrder.getEndTime() != null) {
+            queryWrapper.eq(TMingOrder::getEndTime, tMingOrder.getEndTime());
+        }
+        if (tMingOrder.getSettleTime() != null) {
+            queryWrapper.eq(TMingOrder::getSettleTime, tMingOrder.getSettleTime());
+        }
+        if (tMingOrder.getAccumulaEarn() != null) {
+            queryWrapper.eq(TMingOrder::getAccumulaEarn, tMingOrder.getAccumulaEarn());
+        }
+        if (tMingOrder.getMinOdds() != null) {
+            queryWrapper.eq(TMingOrder::getMinOdds, tMingOrder.getMinOdds());
+        }
+        if (tMingOrder.getMaxOdds() != null) {
+            queryWrapper.eq(TMingOrder::getMaxOdds, tMingOrder.getMaxOdds());
+        }
+        if (StringUtils.isNotBlank(tMingOrder.getAdminUserIds())) {
+            queryWrapper.apply("FIND_IN_SET({0}, admin_user_ids)", tMingOrder.getAdminUserIds());
+        }
+        if (StringUtils.isNotBlank(tMingOrder.getCollectionOrder())) {
+            queryWrapper.eq(TMingOrder::getCollectionOrder, tMingOrder.getCollectionOrder());
+        }
+        if (tMingOrder.getUserId() != null) {
+            queryWrapper.eq(TMingOrder::getUserId, tMingOrder.getUserId());
+        }
+        if (tMingOrder.getOrderAmount() != null) {
+            queryWrapper.eq(TMingOrder::getOrderAmount, tMingOrder.getOrderAmount());
+        }
+        // 按创建时间倒序
+        queryWrapper.orderByDesc(TMingOrder::getCreateTime);
+        // 执行分页查询
+        IPage<TMingOrder> result = tMingOrderMapper.selectPage(page, queryWrapper);
+        List<TMingOrder> newList = result.getRecords();
+        if (CollectionUtils.isEmpty(newList)) {
+            return result; // 提前返回,避免后续无意义操作
+        }
+
+        for (TMingOrder mingOrder : newList) {
+            MingProduct product = tMingProductMapper.selectById(mingOrder.getPlanId());
+            mingOrder.setLogo(null != product ? product.getIcon(): null);
+        }
+        if(!CollectionUtils.isEmpty(newList)){
+            newList.forEach(t->{
+                Map<String, Object> params = new HashMap<>();
+                params.put("createTime", Objects.nonNull(t.getCreateTime())?t.getCreateTime().getTime():0l);
+                params.put("endTime", Objects.nonNull(t.getEndTime())?t.getEndTime().getTime():0l);
+                t.setParams(params);
+            });
+        }
+        return result;
+    }
+
+
+
+
 }
 

+ 14 - 0
qnfhq-api/src/test/java/DemoApplicationTest.java

@@ -1,11 +1,14 @@
 import cn.hutool.core.date.DateUtil;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qnfhq.ApiApplication;
 import com.qnfhq.modules.business.dao.TMingOrderMapper;
 import com.qnfhq.modules.business.entity.TMingOrder;
+import com.qnfhq.modules.business.service.ITMingOrderService;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 
@@ -19,6 +22,17 @@ public class DemoApplicationTest {
     @Resource
     private TMingOrderMapper tMingOrderMapper;
 
+    @Autowired
+    private ITMingOrderService itMingOrderService;
+
+    @Test
+    void test1() {
+
+        IPage<TMingOrder> tMingOrderIPage = itMingOrderService.selectTMingOrderList(new TMingOrder());
+        System.out.println(tMingOrderIPage);
+    }
+
+
     @Test
     void test2() {
         List<TMingOrder> tMingOrders = tMingOrderMapper.selectList(new QueryWrapper<>());