From eb706a988e747b624fda0d44e0aaf6a4ee5e20eb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 26 May 2022 11:27:03 +0800
Subject: [PATCH] fix saveOrder zkPrice is null
---
zq-erp/src/test/java/com/matrix/JyyTests.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 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..0d4d794 100644
--- a/zq-erp/src/test/java/com/matrix/JyyTests.java
+++ b/zq-erp/src/test/java/com/matrix/JyyTests.java
@@ -1,13 +1,14 @@
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.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;
@@ -20,11 +21,10 @@
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.HashMap;
import java.util.List;
-import java.util.Map;
/**
* 测试类示例
@@ -51,8 +51,6 @@
@Autowired
SysVipInfoServiceImpl sysVipInfoService;
- @Autowired
- RedisClient redisClient;
@Autowired
@@ -60,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
@@ -75,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);
}
@@ -89,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);
@@ -113,6 +146,7 @@
SysFunction sysFunction = jsonArray.get(i, SysFunction.class);
System.out.println(sysFunction.getHasThisFn());
}
+*/
--
Gitblit v1.9.1