From 81507d0c196821cd333f08c75f3978e726df24cd Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:38:10 +0800
Subject: [PATCH] Merge branch 'developer'

---
 zq-erp/src/test/java/com/matrix/JyyTests.java |   75 +++++++++++++++++--------------------
 1 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/zq-erp/src/test/java/com/matrix/JyyTests.java b/zq-erp/src/test/java/com/matrix/JyyTests.java
index b955d11..93a4069 100644
--- a/zq-erp/src/test/java/com/matrix/JyyTests.java
+++ b/zq-erp/src/test/java/com/matrix/JyyTests.java
@@ -1,53 +1,24 @@
 package com.matrix;
 
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.matrix.component.redis.RedisClient;
-import com.matrix.core.constance.MatrixConstance;
-import com.matrix.core.tools.LogUtil;
-import com.matrix.system.common.bean.BusParameterSettings;
-import com.matrix.system.common.bean.SysFunction;
-import com.matrix.system.common.dao.BusParameterSettingsDao;
-import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
-import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
-import com.matrix.system.fenxiao.dao.ShopSalesmanOrderDao;
-import com.matrix.system.fenxiao.entity.ShopSalesmanGrade;
-import com.matrix.system.fenxiao.entity.ShopSalesmanOrder;
-import com.matrix.system.hive.bean.SysVipInfo;
-import com.matrix.system.hive.dao.SysOrderDao;
-import com.matrix.system.hive.dao.SysOrderItemDao;
-import com.matrix.system.hive.dao.SysVipInfoDao;
-import com.matrix.system.hive.service.CodeService;
-import com.matrix.system.hive.service.ShoppingGoodsService;
-import com.matrix.system.hive.service.SysOrderService;
-import com.matrix.system.hive.service.SysVipInfoService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.matrix.system.hive.bean.MoneyCardUse;
+import com.matrix.system.hive.dao.MoneyCardUseDao;
 import com.matrix.system.hive.service.imp.SysVipInfoServiceImpl;
 import com.matrix.system.score.dao.ScoreVipDetailDao;
 import com.matrix.system.score.service.ScoreVipDetailService;
-import com.matrix.system.shopXcx.bean.ShopOrder;
-import com.matrix.system.shopXcx.bean.ShopOrderDetails;
-import com.matrix.system.shopXcx.bean.ShopProduct;
-import com.matrix.system.shopXcx.dao.ShopOrderDao;
-import com.matrix.system.shopXcx.dao.ShopOrderDetailsDao;
 import com.matrix.system.shopXcx.dao.ShopOrderV2Dao;
-import com.matrix.system.shopXcx.dao.ShopSkuDao;
 import com.matrix.system.shopXcx.mqTask.OrderDingDingNoticeTask;
-import com.rabbitmq.client.Delivery;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 测试类示例
@@ -74,19 +45,41 @@
     @Autowired
     SysVipInfoServiceImpl sysVipInfoService;
 
-    @Autowired
-    RedisClient redisClient;
 
 
     @Autowired
     OrderDingDingNoticeTask orderDingDingNoticeTask;
 
+    @Autowired
+    MoneyCardUseDao moneyCardUseDao;
+
+
+    @Test
+    public void finxMoneyCardUserId() throws IOException {
+        long id=2531;
+        final List<MoneyCardUse> moneyCardUses = moneyCardUseDao.selectList(new LambdaQueryWrapper<MoneyCardUse>().gt(MoneyCardUse::getId, 2531));
+
+        for (MoneyCardUse moneyCardUs : moneyCardUses) {
+            moneyCardUseDao.updateId(moneyCardUs.getId(),++id);
+        }
+
+        System.out.println(moneyCardUses.size());
+    }
+
+
+
+
     @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);
 
 
     }
@@ -95,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);
@@ -119,6 +113,7 @@
            SysFunction sysFunction = jsonArray.get(i, SysFunction.class);
            System.out.println(sysFunction.getHasThisFn());
        }
+*/
 
 
 

--
Gitblit v1.9.1