From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/test/java/com/matrix/SourceFlowTests.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
index 6cc43c8..8f30c3b 100644
--- a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
+++ b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
@@ -1,11 +1,16 @@
package com.matrix;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.matrix.component.rabbitmq.RabiitMqTemplate;
+import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
+import com.matrix.config.RabbitMqConfig;
import com.matrix.core.tools.StringUtils;
-import com.matrix.system.constance.Dictionary;
+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.hive.service.SysOrderService;
+import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
+import com.matrix.system.shopXcx.vo.SalesmanVo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +53,31 @@
@Autowired
private SysVipInfoDao vipInfoDao;
+ @Autowired
+ RabiitMqTemplate rabiitMqTemplate;
+@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
@@ -124,7 +153,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());
@@ -171,4 +200,9 @@
}
}
+ @Autowired
+ private ShopSalesmanApplyDao salesmanApplyDao;
+
+
+
}
--
Gitblit v1.9.1