From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java b/ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java
index b7c3bc5..f1626d5 100644
--- a/ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java
+++ b/ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java
@@ -1,27 +1,39 @@
-package com.ruioyi.shop;
-
-
-import com.ruoyi.shop.RuoYiShopApplication;
-import com.ruoyi.shop.service.task.AgencyTaskService;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import javax.annotation.Resource;
-
-/**
- * @ClassName systemTest
- * @Description TODO
- * @Author jqs
- * @Date 2023/6/7 10:57
- * @Version 1.0
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = RuoYiShopApplication.class)
-public class shopTest {
-
- @Resource
- private AgencyTaskService agencyTaskService;
-
-
-}
+//package com.ruioyi.shop;
+//
+//
+//import com.ruoyi.common.core.domain.R;
+//import com.ruoyi.common.core.utils.uuid.IdUtils;
+//import com.ruoyi.shop.RuoYiShopApplication;
+//import com.ruoyi.shop.domain.vo.MerchantBasicdataSettlementVo;
+//import com.ruoyi.shop.domain.vo.MerchantBasicdataVo;
+//import com.ruoyi.shop.service.task.AgencyTaskService;
+//import com.ruoyi.shop.util.HuiFuTianXiaUtil;
+//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.util.List;
+//
+///**
+// * @ClassName systemTest
+// * @Description
+// * @Author jqs
+// * @Date 2023/6/7 10:57
+// * @Version 1.0
+// */
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@SpringBootTest(classes = RuoYiShopApplication.class)
+//public class shopTest {
+//
+// @Resource
+// private AgencyTaskService agencyTaskService;
+//
+// @Test
+// public void test(){
+//// R r = HuiFuTianXiaUtil.weixinPayment(IdUtils.simpleUUID(), "支付测试", 0.01D, "oRett5nJInl1AsxEEwHGPBpRKwzw", "");
+//// R<List<MerchantBasicdataSettlementVo>> merchantBasicdataSettlement = HuiFuTianXiaUtil.getMerchantBasicdataSettlement(IdUtils.simpleUUID(), "6666000140729384", "20231001", "20231015", "1", "10");
+// R<MerchantBasicdataVo> merchantBasicdataVoR = HuiFuTianXiaUtil.queryMerchantBasicdata(IdUtils.simpleUUID(), "6666000141286934");
+// }
+//}
--
Gitblit v1.7.1