Merge branch 'developer' into alpha

姜友瑶

2022-05-17 206b2a8034f066f7f4d08755abfee3f5049d0632

 zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java

@@ -1,13 +1,21 @@
package com.matrix;

import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.fenxiao.dao.BizUserDao;
import com.matrix.system.fenxiao.entity.BizUser;
import com.matrix.system.hive.bean.MoneyCardUse;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.dao.SysBedInfoDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.system.hive.service.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +23,7 @@
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;

@@ -41,6 +50,58 @@
   @Autowired
   SysVipInfoService sysVipInfoService;

   @Autowired
   private SysUsersService sysUsersService;

   @Autowired
   private DefaultAuthorityManager authorityManager;

   @Autowired
   SysShopInfoDao sysShopInfoDao;

   @Autowired
   SysCompanyDao sysCompanyDao;

   @Autowired
   private SysShopInfoService sysShopInfoService;

   @Resource
   private SysOrderService sysOrderService;

   @Resource
   private SysBedInfoService bedInfoService;

   @Resource
   private SysWorktimeService sysWorkTimeService;


   @Resource
   private SysUsersService usersService;

   @Autowired
   private SysUsersDao sysUsersDao;


   @Autowired
   private SysBedInfoDao sysBedInfoDao;
   @Resource
   private SysOrderService orderService;
   @Autowired
   private BusParameterSettingsDao busParameterSettingsDao;
   @Autowired
   private SysOrderItemDao orderItemDao;

   @Resource
   private MoneyCardUseService cardUseService;
   @Test
   public void findOrderById() {
      Long vipId = 111L;
      MoneyCardUse moneyCardUse = new MoneyCardUse();
      moneyCardUse.setVipId(vipId);
      moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
      List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
   }

   @Test
   @Transactional
   public void addSettings(){