Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductScrmController.java

@@ -78,7 +78,7 @@ public class FsStoreProductScrmController extends BaseController {
     public R selectForbiddenKeywords(@RequestBody ForbiddenKeywordsVO vo) {
         if(org.apache.commons.lang3.StringUtils.isEmpty(vo.getKeywords()))return R.ok().put("data", true);
         String keywords = vo.getKeywords();
-        SelectForbiddenKeywordsVo selectForbiddenKeywordsVo = fsStoreProductService.selectForbiddenKeywords(keywords);
+        SelectForbiddenKeywordsVo selectForbiddenKeywordsVo = fsStoreProductService.selectForbiddenKeywords(vo);
         if(ObjectUtils.isEmpty(selectForbiddenKeywordsVo)){
             return R.ok().put("data", true);
         }else{

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreProductScrmService.java

@@ -34,10 +34,10 @@ public interface IFsStoreProductScrmService
     /**
      * 商品关键字检查
      * 只要商品关键字在数据库中存在，就不允许添加商品。
-     * @param keyWords
+     * @param vo
      * @return
      */
-    SelectForbiddenKeywordsVo selectForbiddenKeywords(String keyWords);
+    SelectForbiddenKeywordsVo selectForbiddenKeywords(ForbiddenKeywordsVO vo);
 
     /**
      * 查询商品

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -152,11 +152,11 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     /**
      * 商品关键字检查,这里需要用一些关键字匹配
      * 只要商品关键字在数据库中存在，就不允许添加商品。
-     * @param keyWords
+     * @param vo
      * @return
      */
     @Override
-    public SelectForbiddenKeywordsVo selectForbiddenKeywords(String keyWords){
+    public SelectForbiddenKeywordsVo selectForbiddenKeywords(ForbiddenKeywordsVO vo){
         SelectForbiddenKeywordsVo result = new SelectForbiddenKeywordsVo();
         List<ForbiddenOnlineMedicine> forbiddenOnlineMedicines = fsStoreProductMapper.selectForbiddenKeywords();
         //提示语Map
@@ -169,27 +169,31 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
             if (originalKey == null && originalIngredient == null) {
                 continue;
             }
-            //TODO 成分不进入这个检查
             String processedKey = null;
-            if (originalKey != null) {
-                processedKey = originalKey.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
-            }
-            if (processedKey != null) {
-                String  processedChange = cleanKeyword(processedKey);
-                forbiddenKeywords.add(processedChange);
-                promptWordsMap.put(processedChange, medicine.getForbiddenKeywords());
-            }
-            String processedIngredient = null;
-            //TODO 如果是名称就需要跳过
-            if (originalIngredient != null) {
-                processedIngredient = originalIngredient.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
+            if(vo.getField().equals("productName")){
+                if (originalKey != null) {
+                    processedKey = originalKey.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
+                }
+                if (processedKey != null) {
+                    String  processedChange = cleanKeyword(processedKey);
+                    forbiddenKeywords.add(processedChange);
+                    promptWordsMap.put(processedChange, medicine.getForbiddenKeywords());
+                }
+
             }
-            if (processedIngredient != null && !Objects.equals(processedKey, processedIngredient)) {
-                String  medicineIngredientChange = cleanKeyword(processedIngredient);
-                forbiddenKeywords.add(medicineIngredientChange);
-                promptWordsMap.put(medicineIngredientChange, medicine.getMedicineIngredient());
+            if(vo.getField().equals("ingredient")){
+                String processedIngredient = null;
+                if (originalIngredient != null) {
+                    processedIngredient = originalIngredient.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
+                }
+                if (processedIngredient != null && !Objects.equals(processedKey, processedIngredient)) {
+                    String  medicineIngredientChange = cleanKeyword(processedIngredient);
+                    forbiddenKeywords.add(medicineIngredientChange);
+                    promptWordsMap.put(medicineIngredientChange, medicine.getMedicineIngredient());
+                }
             }
         }
+        String keyWords = vo.getKeywords();
         DrugComponentAnalyzer.CheckResult checkResult = DrugComponentAnalyzer.checkForbiddenComponents(forbiddenKeywords, keyWords);
         boolean forbidden = checkResult.isForbidden();
         if(!forbidden){

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreProductScrmController.java

@@ -65,7 +65,7 @@ public class FsStoreProductScrmController extends BaseController
     public R selectForbiddenKeywords(@RequestBody ForbiddenKeywordsVO vo) {
         if(org.apache.commons.lang3.StringUtils.isEmpty(vo.getKeywords()))return R.ok().put("data", true);
         String keywords = vo.getKeywords();
-        SelectForbiddenKeywordsVo selectForbiddenKeywordsVo = fsStoreProductService.selectForbiddenKeywords(keywords);
+        SelectForbiddenKeywordsVo selectForbiddenKeywordsVo = fsStoreProductService.selectForbiddenKeywords(vo);
         if(ObjectUtils.isEmpty(selectForbiddenKeywordsVo)){
             return R.ok().put("data", true);
         }else{