From d99912d716c7682eead7ea322769bd00c0ba7dd9 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 31 Oct 2025 22:44:56 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E8=B0=83?= =?UTF-8?q?=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/migartion/GtAndFhbBizController.java | 16 +++++++++++++--- .../xkt/migartion/GtAndTyBiz2Controller.java | 18 ++++++++++++++---- .../xkt/migartion/GtAndTyBizController.java | 16 +++++++++++++--- .../xkt/migartion/GtOnlyBizController.java | 16 +++++++++++++--- .../migartion/GtOtherBizAfterController.java | 16 +++++++++++++--- .../com/ruoyi/common/constant/Constants.java | 5 ++++- .../service/impl/StoreProductServiceImpl.java | 2 +- 7 files changed, 71 insertions(+), 18 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java index 93048941b..291409b79 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java @@ -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)) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBiz2Controller.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBiz2Controller.java index 12b61395f..e9269dbf2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBiz2Controller.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBiz2Controller.java @@ -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)) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java index 2a4a51801..104fd12fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java @@ -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)) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOnlyBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOnlyBizController.java index 570b53e06..19c053521 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOnlyBizController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOnlyBizController.java @@ -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)) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOtherBizAfterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOtherBizAfterController.java index 5a9e1bf0f..7695142f6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOtherBizAfterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtOtherBizAfterController.java @@ -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)) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index cac129eb8..a7b709b1e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -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"; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index e580d853c..0916fa0c4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -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()); }