From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-order/src/test/java/com/ruoyi/order/orderTest.java |   86 ++++++++++++++++++++++++-------------------
 1 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/test/java/com/ruoyi/order/orderTest.java b/ruoyi-modules/ruoyi-order/src/test/java/com/ruoyi/order/orderTest.java
index a73a88d..17ad79f 100644
--- a/ruoyi-modules/ruoyi-order/src/test/java/com/ruoyi/order/orderTest.java
+++ b/ruoyi-modules/ruoyi-order/src/test/java/com/ruoyi/order/orderTest.java
@@ -1,38 +1,48 @@
-package com.ruoyi.order;
-
-import com.ruoyi.order.service.order.OrderService;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.annotation.Resource;
-
-/**
- * @ClassName orderTest
- * @Description TODO
- * @Author jqs
- * @Date 2023/8/18 11:12
- * @Version 1.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = RuoYiOrderApplication.class)
-public class orderTest {
-
-
-    @Resource
-    private OrderService orderService;
-
-    /*@Test
-    public void main() {
-
-        AppPlaceOrderVo appPlaceOrderVo = new AppPlaceOrderVo();
-
-        orderService.createWxPayInfo( appPlaceOrderVo, 280L, 50L,
-                "测试支付商品", "SC202308160046",
-                "0fa36ad3edcc40bebc2795cc505b5272", new BigDecimal("0.1"),
-                "oL-gp5GG6-KRVSIAE_qYLMULPFjw", "127.0.0.1", Arrays.asList("测试支付商品"));
-        System.out.println(appPlaceOrderVo.toString());
-    }*/
-
-
-}
+//package com.ruoyi.order;
+//
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.ruoyi.common.security.utils.SecurityUtils;
+//import com.ruoyi.order.domain.dto.MerVerifyOrderDto;
+//import com.ruoyi.order.domain.dto.MgtShopOrderPageDto;
+//import com.ruoyi.order.domain.vo.MerVerifyOrderVo;
+//import com.ruoyi.order.domain.vo.MgtActivityOrderPageVo;
+//import com.ruoyi.order.service.order.OrderService;
+//import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//
+//import javax.annotation.Resource;
+//import java.math.BigDecimal;
+//import java.util.List;
+//
+///**
+// * @ClassName orderTest
+// * @Description TODO
+// * @Author jqs
+// * @Date 2023/8/18 11:12
+// * @Version 1.0
+// */
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@SpringBootTest(classes = RuoYiOrderApplication.class)
+//public class orderTest {
+//
+//
+//    @Resource
+//    private OrderService orderService;
+//
+//    @Test
+//    public void main() {
+//        MgtShopOrderPageDto mgtShopOrderPageDto = new MgtShopOrderPageDto();
+//        Long userId = SecurityUtils.getUserId();
+//        mgtShopOrderPageDto.setUserId(userId);
+//        Page<MgtActivityOrderPageVo> page = new Page<>();
+//        page.setSize(Integer.MAX_VALUE);
+//        page.setCurrent(1);
+//        List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto);
+//
+//    }
+//
+//
+//}

--
Gitblit v1.7.1