From 7fc6d002c79af4aa5ac3c23c9d205525354b0415 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 3 Jan 2024 16:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E4=BD=BF=E7=94=A8=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/oms/service/impl/OmsOrderServiceImpl.java  |  3 ++-
 .../qs/serve/modules/tbs/mapper/TbsBudgetMapper.java   | 10 ++++++++++
 .../modules/tbs/service/impl/TbsBudgetServiceImpl.java |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
index 98b76e10..cf011375 100644
--- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
@@ -632,7 +632,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
             xltOrderItem.setId(xltOrder.getId()+"_"+(i+1));
             xltOrderItem.setDingDanID(xltOrder.getId());
             xltOrderItem.setSpuCode(orderItem.getSpuCode());
-            if(!StringUtils.hasText(orderItem.getSkuCode())){
+            boolean eq = orderItem.getSkuCode().equals(orderItem.getSpuCode());
+            if(!StringUtils.hasText(orderItem.getSkuCode())||eq){
                 Assert.throwEx("SKU【"+orderItem.getSpuCode()+"】存货缺失，请联系档案负责人");
             }
             xltOrderItem.setChanPinBianHao(orderItem.getSkuCode());
diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java
index 42707e54..fc3b20a1 100644
--- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java
+++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java
@@ -1,9 +1,11 @@
 package com.qs.serve.modules.tbs.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.so.TbsBudgetSo;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -21,5 +23,13 @@ public interface TbsBudgetMapper extends BaseMapper<TbsBudget> {
      */
     List<Long> selectBudgetId(@Param("query") TbsBudgetSo budgetSo);
 
+    @InterceptorIgnore(tenantLine = "true")
+    @Update("update tbs_budget_condition set brand_id = SUBSTRING_INDEX(target_level_path_ids,'_',1)")
+    int updateBudgetCondition();
+
+    @InterceptorIgnore(tenantLine = "true")
+    @Update("update tbs_budget set center_combo = concat(center_type,'_',center_id)")
+    int updateBudgetComboCenter();
+
 }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
index 5741dcfa..7361f573 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
@@ -230,6 +230,9 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         //设置条件
         this.updateById(budget);
         buildCondition(budget.getId(),brandIds,categoryIds,seriesIds,spuIds,skuIds);
+        //冗余字段初始化
+        baseMapper.updateBudgetCondition();
+        baseMapper.updateBudgetComboCenter();
     }
 
     /**