|
@@ -478,17 +478,17 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
|
|
|
product.setCreateTime(new Date());
|
|
product.setCreateTime(new Date());
|
|
|
|
|
|
|
|
// 根据经营范围校验商品类型
|
|
// 根据经营范围校验商品类型
|
|
|
- if (store != null && com.fs.common.utils.StringUtils.isNotEmpty(store.getSelectableProductTypes())) {
|
|
|
|
|
- String productTypeName = getProductTypeName(product.getCateId());
|
|
|
|
|
- if (com.fs.common.utils.StringUtils.isNotEmpty(productTypeName)) {
|
|
|
|
|
- // 直接使用工具类方法校验
|
|
|
|
|
- //boolean isAllowed = BusinessScopeProductTypeUtil.isProductTypeAllowed(store.getSelectableProductTypes(), productTypeName);
|
|
|
|
|
- boolean isAllowed = validateShopBusinessScope(store.getBusinessScope(), productTypeName);
|
|
|
|
|
- if (!isAllowed) {
|
|
|
|
|
- return R.error("该商品类型[" + productTypeName + "]不在店铺经营范围允许的商品类型内,请联系管理员核实经营范围");
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if (store != null && com.fs.common.utils.StringUtils.isNotEmpty(store.getSelectableProductTypes())) {
|
|
|
|
|
+// String productTypeName = getProductTypeName(product.getCateId());
|
|
|
|
|
+// if (com.fs.common.utils.StringUtils.isNotEmpty(productTypeName)) {
|
|
|
|
|
+// // 直接使用工具类方法校验
|
|
|
|
|
+// //boolean isAllowed = BusinessScopeProductTypeUtil.isProductTypeAllowed(store.getSelectableProductTypes(), productTypeName);
|
|
|
|
|
+// boolean isAllowed = validateShopBusinessScope(store.getBusinessScope(), productTypeName);
|
|
|
|
|
+// if (!isAllowed) {
|
|
|
|
|
+// return R.error("该商品类型[" + productTypeName + "]不在店铺经营范围允许的商品类型内,请联系管理员核实经营范围");
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
//判断是否是纯正堂非药品商品不审核
|
|
//判断是否是纯正堂非药品商品不审核
|
|
|
if(CZT.equals(cloudHostProper.getCompanyName()) || param.getIsDrug() != 1){
|
|
if(CZT.equals(cloudHostProper.getCompanyName()) || param.getIsDrug() != 1){
|