~jiangyouyao/beauty-erp.git

			@@ -1,18 +1,15 @@
			package com.matrix.system.shopXcx.api.action;

			import com.matrix.core.pojo.AjaxResult;
			import com.matrix.core.pojo.PaginationVO;
			import com.matrix.core.tools.StringUtils;
			import com.matrix.biz.bean.BizUser;
			import com.matrix.system.common.bean.CustomerDataDictionary;
			import com.matrix.system.common.dao.CustomerDataDictionaryDao;
			import com.matrix.component.redis.RedisUserLoginUtils;
			import com.matrix.core.pojo.AjaxResult;
			import com.matrix.core.tools.StringUtils;
			import com.matrix.system.common.constance.AppConstance;

			import com.matrix.system.common.dao.CustomerDataDictionaryDao;
			import com.matrix.system.common.interceptor.HostInterceptor;
			import com.matrix.system.shopXcx.api.service.WxShopCouponService;
			import com.matrix.system.shopXcx.bean.*;
			import com.matrix.system.shopXcx.dao.*;
			import com.matrix.system.shopXcx.api.service.WxShopCouponService;
			import org.apache.commons.collections.CollectionUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Controller;
			@@ -93,7 +90,6 @@
			List<ShopProductAttrRef> shopProductAttrRefs = shopProductAttrRefDao.selectByPid(id);
			List<ShopProductImg> shopProductImgs = shopProductImgDao.selectByPid(id);
			List<ShopSku> shopSkus = shopSkuDao.selectByPid(id);
			// List<ShopSku> shopSkus = shopSkuDao.selectByPidAndShopid(id, shopId);
			List<ShopProductParamRef> shopProductParamRefs = shopProductParamRefDao.selectByPid(id);
			shopProduct.setAttrRefs(shopProductAttrRefs);
			shopProduct.setProductImgs(shopProductImgs);
			@@ -161,9 +157,6 @@
			if (CollectionUtils.isEmpty(shopProducts)) {
			shopProduct.setDelFlag(AppConstance.DATA_USEABLE);
			shopProduct.setStatus(AppConstance.IS_PUTAWAY);
			if(shopProduct.getIsService()==null){
			shopProduct.setIsService(2);
			}
			shopProduct.setCompanyId(HostInterceptor.getCompanyId());
			shopProducts = shopProductDao.selectByModelWx(shopProduct);
			}