|
|
@@ -4,7 +4,9 @@ import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
|
import com.fs.common.core.domain.R;
|
|
|
+import com.fs.store.domain.FsStoreProduct;
|
|
|
import com.fs.store.domain.FsStoreProductAttr;
|
|
|
+import com.fs.store.domain.FsStoreProductAttrValue;
|
|
|
import com.fs.store.param.FsProductAttrValueParam;
|
|
|
import com.fs.store.param.FsStoreProductAddEditParam;
|
|
|
import com.fs.store.param.FsStoreTuiProductAttrValueParam;
|
|
|
@@ -28,7 +30,6 @@ import com.fs.common.annotation.Log;
|
|
|
import com.fs.common.core.controller.BaseController;
|
|
|
import com.fs.common.core.domain.AjaxResult;
|
|
|
import com.fs.common.enums.BusinessType;
|
|
|
-import com.fs.store.domain.FsStoreProduct;
|
|
|
import com.fs.store.service.IFsStoreProductService;
|
|
|
import com.fs.common.utils.poi.ExcelUtil;
|
|
|
import com.fs.common.core.page.TableDataInfo;
|
|
|
@@ -115,7 +116,9 @@ public class FsStoreProductController extends BaseController
|
|
|
{
|
|
|
FsStoreProduct product=fsStoreProductService.selectFsStoreProductById(productId);
|
|
|
List<FsStoreProductAttr> attrs=attrService.selectFsStoreProductAttrByProductId(productId);
|
|
|
- return R.ok().put("data",product).put("attrs", attrs);
|
|
|
+ List<FsStoreProductAttrValue> values =
|
|
|
+ attrValueService.selectFsStoreProductAttrValueByProductId(productId);
|
|
|
+ return R.ok().put("data",product).put("attrs", attrs).put("values", values);
|
|
|
}
|
|
|
|
|
|
@PreAuthorize("@ss.hasPermi('store:storeProduct:add')")
|