From 7387cb3e2f9e8b588c7be30b129faeee4050034d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Mar 2021 18:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/test/java/com/matrix/SourceFlowTests.java | 98 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
index df6c349..2858713 100644
--- a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
+++ b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
@@ -1,15 +1,12 @@
package com.matrix;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.tools.StringUtils;
-import com.matrix.system.constance.Dictionary;
-import com.matrix.system.hive.bean.MoneyCardUse;
-import com.matrix.system.hive.bean.ShoppingGoods;
-import com.matrix.system.hive.bean.SysSourceFlow;
-import com.matrix.system.hive.bean.SysVipInfo;
-import com.matrix.system.hive.dao.MoneyCardUseDao;
-import com.matrix.system.hive.dao.ShoppingGoodsDao;
-import com.matrix.system.hive.dao.SysSourceFlowDao;
-import com.matrix.system.hive.dao.SysVipInfoDao;
+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;
@@ -19,6 +16,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.sql.DataSource;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -29,7 +27,7 @@
* @date 2019年2月25日
*/
@RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = {ZqErpApplication.class},webEnvironment =SpringBootTest.WebEnvironment.RANDOM_PORT)
public class SourceFlowTests {
@Autowired
@@ -102,5 +100,85 @@
}
+ @Autowired
+ private SysOrderDao sysOrderDao;
+
+ @Autowired
+ private CodeService codeService;
+
+ @Autowired
+ private SysOrderItemDao sysOrderItemDao;
+
+ @Autowired
+ private SysOrderFlowDao sysOrderFlowDao;
+
+ /**
+ * sysOrderFlowDao.xml insert语句需将createTime和updateTime修改
+ * SysOrderDao.xml insert语句需将update语句中cashPay加上 or cashPay == 0
+ *
+ */
+ @Test
+ public void orderTransfer() {
+ SysOrder query = new SysOrder();
+ query.setStatu("已付款");
+ List<SysOrder> sysOrders = sysOrderDao.selectByModel(query);
+
+ for (SysOrder sysOrder : sysOrders) {
+ sysOrder.setCashPay(sysOrder.getZkTotal());
+ sysOrder.setCardPay(0);
+ sysOrderDao.update(sysOrder);
+
+ List<SysOrderItem> items = sysOrderItemDao.selectByOrderId(sysOrder.getId());
+
+ SysOrderFlow flow = new SysOrderFlow();
+ flow.setFlowNo("F" + sysOrder.getOrderNo().substring(1) + "-" + 1);
+ if (items.size() <= 0) {
+ continue;
+ }
+ Long goodsId = items.get(0).getGoodsId();
+ ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);
+
+ int j = 1;
+ boolean flag = false;
+ while (goods == null) {
+ if (items.size() <= 1) {
+ flag = true;
+ break;
+ }
+ goodsId = items.get(j).getGoodsId();
+ goods = shoppingGoodsDao.selectById(goodsId);
+ j++;
+ if (j + 1 >= items.size()) {
+ flag = true;
+ break;
+ }
+ }
+
+ if (flag) {
+ continue;
+ }
+
+ flow.setFlowContent(goods.getName().trim() + "等" + items.size() + "件产品");
+ flow.setOrderId(sysOrder.getId());
+ flow.setAmount(BigDecimal.valueOf(sysOrder.getZkTotal()));
+ flow.setVipId(sysOrder.getVipId());
+ flow.setFlowType(SysOrderFlow.FLOW_TYPE_BUY);
+ flow.setPayMethod("现金");
+ flow.setShopId(sysOrder.getShopId());
+ flow.setCreateTime(sysOrder.getOrderTime());
+ flow.setUpdateTime(sysOrder.getOrderTime());
+ flow.setCompanyId(sysOrder.getCompanyId());
+ sysOrderFlowDao.insert(flow);
+ }
+ }
+
+ @Autowired
+ private ShopSalesmanApplyDao salesmanApplyDao;
+
+ @Test
+ public void inPageTest() {
+ Page<SalesmanVo> page = new Page<>(1, 10);
+ salesmanApplyDao.selectInvitationuserInPage(page, "oLdgp47g7SXJnmti1iDzQaJpXNz4");
+ }
}
--
Gitblit v1.9.1