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/JyyTests.java | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/zq-erp/src/test/java/com/matrix/JyyTests.java b/zq-erp/src/test/java/com/matrix/JyyTests.java index 741ebdc..93a4069 100644 --- a/zq-erp/src/test/java/com/matrix/JyyTests.java +++ b/zq-erp/src/test/java/com/matrix/JyyTests.java @@ -1,11 +1,7 @@ package com.matrix; -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.matrix.component.redis.RedisClient; -import com.matrix.system.common.bean.SysFunction; import com.matrix.system.hive.bean.MoneyCardUse; import com.matrix.system.hive.dao.MoneyCardUseDao; import com.matrix.system.hive.service.imp.SysVipInfoServiceImpl; @@ -22,9 +18,7 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * 测试类示例 @@ -51,8 +45,6 @@ @Autowired SysVipInfoServiceImpl sysVipInfoService; - @Autowired - RedisClient redisClient; @Autowired @@ -75,12 +67,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); } @@ -89,19 +88,20 @@ @Test public void testRedis() { - List<SysFunction> fnList = new ArrayList<>(); + /*List<SysFunction> fnList = new ArrayList<>(); fnList.add(new SysFunction()); Map map = new HashMap(); map.put("a", fnList); redisClient.saveMapValue("map", map); - +*/ } @Test public void testRedis2() { +/* String map = redisClient.getCachedValue("map"); JSONObject json = JSONUtil.parseObj(map); @@ -113,6 +113,7 @@ SysFunction sysFunction = jsonArray.get(i, SysFunction.class); System.out.println(sysFunction.getHasThisFn()); } +*/ -- Gitblit v1.9.1