~jiangyouyao/beauty-erp.git

			@@ -5,6 +5,7 @@
			import com.matrix.core.exception.GlobleException;
			import com.matrix.core.pojo.PaginationVO;
			import com.matrix.core.tools.DateUtil;
			import com.matrix.core.tools.LogUtil;
			import com.matrix.core.tools.StringUtils;
			import com.matrix.core.tools.WebUtil;
			import com.matrix.system.app.dto.OrderListDto;
			@@ -15,6 +16,7 @@
			import com.matrix.system.app.vo.RankingVo;
			import com.matrix.system.common.bean.BusParameterSettings;
			import com.matrix.system.common.bean.SysUsers;
			import com.matrix.system.common.constance.AppConstance;
			import com.matrix.system.common.dao.BusParameterSettingsDao;
			import com.matrix.system.common.dao.SysUsersDao;
			import com.matrix.system.constance.Dictionary;
			@@ -119,6 +121,8 @@
			@Autowired
			private SysInstoreInfoService sysInstoreInfoService;

			@Autowired
			BusParameterSettingsDao parameterSettingsDao;

			@Value("${evn}")
			private String evn;
			@@ -984,8 +988,6 @@
			}


			@Autowired
			BusParameterSettingsDao parameterSettingsDao;

			/**
			* @param order 新增出库单并更新本店库存
			@@ -994,6 +996,9 @@
			*/
			@Override
			public void addOutStore(SysOrder order) {

			BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, order.getCompanyId());
			if(AppConstance.IS_Y.equals(manageStockSetting.getParamValue())){

			List<SysOutStoreItem> storeItemList = new ArrayList<>();

			@@ -1092,6 +1097,10 @@
			}
			});
			sysOutStoreItemDao.batchInsert(realOutStoreItemList);
			}

			}else{
			LogUtil.debug("不管理库存");
			}


			@@ -1636,12 +1645,16 @@
			shoppingGoodsDao.update(goods);
			}

			BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, sysOrder.getCompanyId());
			if(AppConstance.IS_Y.equals(manageStockSetting.getParamValue())){
			// 家居产品退库存
			if (CollectionUtils.isNotEmpty(returnGoodsList)) {
			refundInstore(returnGoodsList);
			}
			}

			}

			/**
			* 退款入库
			*/