From e423d56d730db1baed24f3f7dbbc4141038776b6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:12:03 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式

---
 zq-erp/src/test/java/com/matrix/JyyTests.java |  105 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 95 insertions(+), 10 deletions(-)

diff --git a/zq-erp/src/test/java/com/matrix/JyyTests.java b/zq-erp/src/test/java/com/matrix/JyyTests.java
index 7dec718..b955d11 100644
--- a/zq-erp/src/test/java/com/matrix/JyyTests.java
+++ b/zq-erp/src/test/java/com/matrix/JyyTests.java
@@ -1,43 +1,128 @@
 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.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.*;
 
 /**
  * 测试类示例
- * 
+ *
  * @author jiangyouyao
  * @email 512061637@qq.com
  * @date 2019年2月25日
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = {ZqErpApplication.class},webEnvironment =SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = {ZqErpApplication.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class JyyTests {
 
 
-	@Autowired
-	private ShopOrderV2Dao shopOrderV2Dao;
+    @Autowired
+    private ShopOrderV2Dao shopOrderV2Dao;
 
-	@Autowired
-	ScoreVipDetailDao scoreVipDetailDao;
+    @Autowired
+    ScoreVipDetailDao scoreVipDetailDao;
 
-	@Autowired
-	ScoreVipDetailService scoreVipDetailService;
+    @Autowired
+    ScoreVipDetailService scoreVipDetailService;
 
 
-	@Autowired
-	SysVipInfoServiceImpl sysVipInfoService;
+    @Autowired
+    SysVipInfoServiceImpl sysVipInfoService;
+
+    @Autowired
+    RedisClient redisClient;
+
+
+    @Autowired
+    OrderDingDingNoticeTask orderDingDingNoticeTask;
+
+    @Test
+    @Rollback
+    public void testNoticeTask() throws IOException {
+    //    orderDingDingNoticeTask.handle("",new Delivery(null,null,"1295".getBytes()));
 
 
 
 
+    }
 
 
+    @Test
+    public void testRedis() {
+
+        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);
+        String a = json.get("a").toString();
+
+
+        JSONArray jsonArray = JSONUtil.parseArray(a);
+       for (int i=0;i<jsonArray.size();i++){
+           SysFunction sysFunction = jsonArray.get(i, SysFunction.class);
+           System.out.println(sysFunction.getHasThisFn());
+       }
+
+
+
+
+    }
 
 }

--
Gitblit v1.9.1