From 5011c035b9902637b1cb4d08112e00239ff99381 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 23 May 2022 12:05:36 +0800
Subject: [PATCH] 合并master
---
zq-erp/src/test/java/com/matrix/JyyTests.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/JyyTests.java b/zq-erp/src/test/java/com/matrix/JyyTests.java
index 3f4c132..0d4d794 100644
--- a/zq-erp/src/test/java/com/matrix/JyyTests.java
+++ b/zq-erp/src/test/java/com/matrix/JyyTests.java
@@ -1,8 +1,14 @@
package com.matrix;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.matrix.core.pojo.AjaxResult;
+import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.MoneyCardUse;
+import com.matrix.system.hive.bean.SysProjUse;
import com.matrix.system.hive.dao.MoneyCardUseDao;
+import com.matrix.system.hive.dao.ShoppingGoodsDao;
+import com.matrix.system.hive.service.SysProjUseService;
import com.matrix.system.hive.service.imp.SysVipInfoServiceImpl;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import com.matrix.system.score.service.ScoreVipDetailService;
@@ -15,7 +21,9 @@
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit4.SpringRunner;
+import javax.annotation.Resource;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -50,6 +58,33 @@
@Autowired
MoneyCardUseDao moneyCardUseDao;
+ @Resource
+ private SysProjUseService projUseService;
+ @Autowired
+ private ShoppingGoodsDao shoppingGoodsDao;
+
+ @Test
+ public void testGetVipInfo(){
+
+ Long vipId = 111L;
+ AjaxResult result = AjaxResult.buildSuccessInstance("查询成功");
+ SysProjUse queryUse = new SysProjUse();
+ queryUse.setVipId(vipId);
+ queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
+ queryUse.setTaocanId(-1L);
+ queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
+ List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
+ //切换到套餐查询条件
+ queryUse.setTaocanId(null);
+ queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);
+ List<SysProjUse> taoCanList = projUseService.findInPage(queryUse, null);
+ taoCanList.forEach(item->{
+ item.setTaocanProjUse(projUseService.selectTaocanProjUse(item.getId(), queryUse.getStatus()));
+ item.setProjInfo(shoppingGoodsDao.selectById(item.getProjId()));
+ });
+ result.putInMap("projList", projList);
+ result.putInMap("taoCanList", taoCanList);
+ }
@Test
@@ -65,12 +100,19 @@
}
+
+
@Test
@Rollback
public void testNoticeTask() throws IOException {
// orderDingDingNoticeTask.handle("",new Delivery(null,null,"1295".getBytes()));
+ List<JSONObject> storeReceiptWares =new ArrayList<>();
+ JSONObject o=new JSONObject();
+ o.put("id",12);
+ o.put("createBy","");
-
+ storeReceiptWares.add(o);
+ moneyCardUseDao.saveInTimeReceiptWare(storeReceiptWares);
}
--
Gitblit v1.9.1