From baa79615425b71521e67ec8a9344b88ce53fc5de Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 13:47:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/test/java/com/matrix/SourceFlowTests.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
index 6894647..9c1a1bd 100644
--- a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
+++ b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
@@ -2,13 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.tools.StringUtils;
-import com.matrix.system.constance.Dictionary;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
-import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
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.vo.SalesmanVo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -127,7 +125,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());
@@ -179,7 +177,7 @@
@Test
public void inPageTest() {
- Page<ShopSalesmanApply> page = new Page<>(1, 10);
+ Page<SalesmanVo> page = new Page<>(1, 10);
salesmanApplyDao.selectInvitationuserInPage(page, "oLdgp47g7SXJnmti1iDzQaJpXNz4");
}
--
Gitblit v1.9.1