BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：系统调优；

pull/1121/head
liujiang 2025-10-31 22:44:56 +08:00
parent 88ef878053
commit d99912d716
7 changed files with 71 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java
View File

@ -728,13 +728,23 @@ public class GtAndFhbBizController extends BaseController {
if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) {
prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME));
}
// 3. 靴筒面材质
// 3. 鞋面材质（靴筒面材质）
if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) {
prodAttr.setShaftMaterial(attrMap.get(Constants.SHAFT_MATERIAL_NAME));
// 先看靴筒面材质，为空则找帮面材质
String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME);
prodAttr.setShaftMaterial(org.apache.commons.lang3.StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr);
}
// 4. 鞋面内里材质
if (attrMap.containsKey(Constants.SHOE_UPPER_LINING_MATERIAL_NAME)) {
prodAttr.setShoeUpperLiningMaterial(attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME));
// 先找鞋面内里材质，为空 则 再找 内里材质，为空则再找 里料材质
String shoeUpperLiningMaterialAttr = attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME);
if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.INNER_MATERIAL);
if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.OUTER_MATERIAL);
}
}
prodAttr.setShoeUpperLiningMaterial(shoeUpperLiningMaterialAttr);
}
// 5. 靴款品名
if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) {

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBiz2Controller.java
View File

@ -12,7 +12,6 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.es.EsClientWrapper;
import com.ruoyi.framework.notice.fs.FsNotice;
@ -35,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@ -649,13 +649,23 @@ public class GtAndTyBiz2Controller extends BaseController {
if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) {
prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME));
}
// 3. 靴筒面材质
// 3. 鞋面材质（靴筒面材质）
if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) {
prodAttr.setShaftMaterial(attrMap.get(Constants.SHAFT_MATERIAL_NAME));
// 先看靴筒面材质，为空则找帮面材质
String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME);
prodAttr.setShaftMaterial(StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr);
}
// 4. 鞋面内里材质
if (attrMap.containsKey(Constants.SHOE_UPPER_LINING_MATERIAL_NAME)) {
prodAttr.setShoeUpperLiningMaterial(attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME));
// 先找鞋面内里材质，为空 则 再找 内里材质，为空则再找 里料材质
String shoeUpperLiningMaterialAttr = attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME);
if (StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.INNER_MATERIAL);
if (StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.OUTER_MATERIAL);
}
}
prodAttr.setShoeUpperLiningMaterial(shoeUpperLiningMaterialAttr);
}
// 5. 靴款品名
if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) {

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java
View File

@ -694,13 +694,23 @@ public class GtAndTyBizController extends BaseController {
if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) {
prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME));
}
// 3. 靴筒面材质
// 3. 鞋面材质（靴筒面材质）
if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) {
prodAttr.setShaftMaterial(attrMap.get(Constants.SHAFT_MATERIAL_NAME));
// 先看靴筒面材质，为空则找帮面材质
String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME);
prodAttr.setShaftMaterial(org.apache.commons.lang3.StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr);
}
// 4. 鞋面内里材质
if (attrMap.containsKey(Constants.SHOE_UPPER_LINING_MATERIAL_NAME)) {
prodAttr.setShoeUpperLiningMaterial(attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME));
// 先找鞋面内里材质，为空 则 再找 内里材质，为空则再找 里料材质
String shoeUpperLiningMaterialAttr = attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME);
if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.INNER_MATERIAL);
if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.OUTER_MATERIAL);
}
}
prodAttr.setShoeUpperLiningMaterial(shoeUpperLiningMaterialAttr);
}
// 5. 靴款品名
if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) {

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOnlyBizController.java
View File

@ -346,13 +346,23 @@ public class GtOnlyBizController extends BaseController {
if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) {
prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME));
}
// 3. 靴筒面材质
// 3. 鞋面材质（靴筒面材质）
if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) {
prodAttr.setShaftMaterial(attrMap.get(Constants.SHAFT_MATERIAL_NAME));
// 先看靴筒面材质，为空则找帮面材质
String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME);
prodAttr.setShaftMaterial(org.apache.commons.lang3.StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr);
}
// 4. 鞋面内里材质
if (attrMap.containsKey(Constants.SHOE_UPPER_LINING_MATERIAL_NAME)) {
prodAttr.setShoeUpperLiningMaterial(attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME));
// 先找鞋面内里材质，为空 则 再找 内里材质，为空则再找 里料材质
String shoeUpperLiningMaterialAttr = attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME);
if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.INNER_MATERIAL);
if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.OUTER_MATERIAL);
}
}
prodAttr.setShoeUpperLiningMaterial(shoeUpperLiningMaterialAttr);
}
// 5. 靴款品名
if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) {

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOtherBizAfterController.java
View File

@ -392,13 +392,23 @@ public class GtOtherBizAfterController extends BaseController {
if (attrMap.containsKey(Constants.SHAFT_LINING_MATERIAL_NAME)) {
prodAttr.setShaftLiningMaterial(attrMap.get(Constants.SHAFT_LINING_MATERIAL_NAME));
}
// 3. 靴筒面材质
// 3. 鞋面材质（靴筒面材质）
if (attrMap.containsKey(Constants.SHAFT_MATERIAL_NAME)) {
prodAttr.setShaftMaterial(attrMap.get(Constants.SHAFT_MATERIAL_NAME));
// 先看靴筒面材质，为空则找帮面材质
String shaftMaterialAttr = attrMap.get(Constants.SHAFT_MATERIAL_NAME);
prodAttr.setShaftMaterial(org.apache.commons.lang3.StringUtils.isEmpty(shaftMaterialAttr) ? attrMap.get(Constants.UPPER_MATERIAL_NAME) : shaftMaterialAttr);
}
// 4. 鞋面内里材质
if (attrMap.containsKey(Constants.SHOE_UPPER_LINING_MATERIAL_NAME)) {
prodAttr.setShoeUpperLiningMaterial(attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME));
// 先找鞋面内里材质，为空 则 再找 内里材质，为空则再找 里料材质
String shoeUpperLiningMaterialAttr = attrMap.get(Constants.SHOE_UPPER_LINING_MATERIAL_NAME);
if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.INNER_MATERIAL);
if (org.apache.commons.lang3.StringUtils.isEmpty(shoeUpperLiningMaterialAttr)) {
shoeUpperLiningMaterialAttr = attrMap.get(Constants.OUTER_MATERIAL);
}
}
prodAttr.setShoeUpperLiningMaterial(shoeUpperLiningMaterialAttr);
}
// 5. 靴款品名
if (attrMap.containsKey(Constants.SHOE_STYLE_NAME_NAME)) {

5
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
View File

@ -328,12 +328,15 @@ public class Constants
public static final BigDecimal ALI_SERVICE_FEE_RATE = BigDecimal.valueOf(0.006);
public static final String INNER_MATERIAL = "内里材质";
public static final String OUTER_MATERIAL = "里料材质";
public static final String UPPER_MATERIAL = "upperMaterial";
public static final String UPPER_MATERIAL_NAME = "帮面材质";
public static final String SHAFT_LINING_MATERIAL = "shaftLiningMaterial";
public static final String SHAFT_LINING_MATERIAL_NAME = "靴筒内里材质";
public static final String SHAFT_MATERIAL = "shaftMaterial";
public static final String SHAFT_MATERIAL_NAME = "鞋面材质";
public static final String SHAFT_MATERIAL_NAME = "靴筒面材质";
public static final String SHOE_UPPER_LINING_MATERIAL = "shoeUpperLiningMaterial";
public static final String SHOE_UPPER_LINING_MATERIAL_NAME = "鞋面内里材质";
public static final String SHOE_STYLE_NAME = "shoeStyleName";

2
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
View File

@ -1430,7 +1430,7 @@ public class StoreProductServiceImpl implements IStoreProductService {
if (ObjectUtils.isNotEmpty(cateAttr.getShaftLiningMaterial())) {
cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SHAFT_LINING_MATERIAL), cateAttr.getShaftLiningMaterial());
}
// 靴筒面材质
// 鞋面材质
if (ObjectUtils.isNotEmpty(cateAttr.getShaftMaterial())) {
cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SHAFT_MATERIAL), cateAttr.getShaftMaterial());
}