From b6addbdc96eb4fba4c7b3a295ed9d47020f74ceb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 14:19:54 +0800
Subject: [PATCH] fix
---
zq-erp/src/test/java/com/matrix/JyyTests.java | 108 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 68 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..0d4d794 100644
--- a/zq-erp/src/test/java/com/matrix/JyyTests.java
+++ b/zq-erp/src/test/java/com/matrix/JyyTests.java
@@ -1,53 +1,30 @@
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.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;
-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 javax.annotation.Resource;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
/**
* 测试类示例
@@ -74,19 +51,68 @@
@Autowired
SysVipInfoServiceImpl sysVipInfoService;
- @Autowired
- RedisClient redisClient;
@Autowired
OrderDingDingNoticeTask orderDingDingNoticeTask;
+ @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
+ 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 +121,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 +146,7 @@
SysFunction sysFunction = jsonArray.get(i, SysFunction.class);
System.out.println(sysFunction.getHasThisFn());
}
+*/
--
Gitblit v1.9.1