From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/test/java/com/matrix/SourceFlowTests.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
index 2858713..9583c8c 100644
--- a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
+++ b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
@@ -1,12 +1,11 @@
package com.matrix;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.CodeService;
-import com.matrix.system.shopXcx.vo.SalesmanVo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +48,29 @@
@Autowired
private SysVipInfoDao vipInfoDao;
+@Autowired
+WeixinServiceUtil weixinServiceUtil;
+ /**
+ * 企业付款到个人
+ * @throws InterruptedException
+ */
+ @Test
+ public void testPay() throws InterruptedException {
+ weixinServiceUtil.comPay("提现","TX123",1,"oJkRK4yelehsY4S7I6Ee1ydWtQMI",36L);
+ }
+
+
+
+ /**
+ * 发送订阅消息
+ * @throws InterruptedException
+ */
+ @Test
+ public void testTopic() throws InterruptedException {
+ // rabiitMqTemplate.sendTopicMsg(RabbitMqConfig.MQ_EXCHANGE_TOPIC +"dev", MQTaskRouting.CREATE_ORDER+"dev", "123");
+ Thread.sleep(10000);
+ }
@Test
@Transactional
@@ -125,7 +146,7 @@
for (SysOrder sysOrder : sysOrders) {
sysOrder.setCashPay(sysOrder.getZkTotal());
- sysOrder.setCardPay(0);
+ sysOrder.setCardPay(0D);
sysOrderDao.update(sysOrder);
List<SysOrderItem> items = sysOrderItemDao.selectByOrderId(sysOrder.getId());
@@ -175,10 +196,6 @@
@Autowired
private ShopSalesmanApplyDao salesmanApplyDao;
- @Test
- public void inPageTest() {
- Page<SalesmanVo> page = new Page<>(1, 10);
- salesmanApplyDao.selectInvitationuserInPage(page, "oLdgp47g7SXJnmti1iDzQaJpXNz4");
- }
+
}
--
Gitblit v1.9.1