SOP任务营期详情异常问题，聚水潭erp商品更新同步逻辑

fs-company/src/main/java/com/fs/company/controller/qw/SopUserLogsInfoController.java

@@ -26,14 +26,11 @@ import com.fs.sop.params.SendUserLogsInfoMsgParam;
 import com.fs.sop.service.ISopUserLogsInfoService;
 import com.fs.voice.utils.StringUtil;
 import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -98,8 +95,10 @@ public class SopUserLogsInfoController extends BaseController
                     Map<String, QwTag> tagMap = PubFun.listToMapByGroupObject(tagList, QwTag::getTagId);
                     qwExternalContactVOTimes.forEach(e -> {
                         List<String> tagId = JSON.parseArray(e.getTagIds(), String.class);
-                        List<String> tagNameList = tagId.stream().filter(tagMap::containsKey).map(t -> tagMap.get(t).getName()).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
-                        e.setTagIdsName(tagNameList);
+                        if(StringUtils.isNotEmpty(tagId)){
+                            List<String> tagNameList = tagId.stream().filter(tagMap::containsKey).map(t -> tagMap.get(t).getName()).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
+                            e.setTagIdsName(tagNameList);
+                        }
                     });
                 }
                 // 设置联系信息

fs-service/src/main/java/com/fs/erp/http/JstErpHttpServiceImpl.java

@@ -28,16 +28,19 @@ import java.util.Map;
 @Service
 public class JstErpHttpServiceImpl implements JstErpHttpService {
 
-    private static final String BASE_URL = "https://openapi.jushuitan.com/";
+//    private static final String BASE_URL = "https://openapi.jushuitan.com/";正式
+    private static final String BASE_URL = "https://dev-api.jushuitan.com/";//测试
     /**
      * 获取access_token、refresh_token url
      */
-    private static final String GET_INIT_TOKEN_URL = BASE_URL + "openWeb/auth/getInitToken";
+//    private static final String GET_INIT_TOKEN_URL = BASE_URL + "openWeb/auth/getInitToken";正式
+    private static final String GET_INIT_TOKEN_URL = BASE_URL + "openWebIsv/auth/getInitToken";//测试
 
     /**
      * 更新access_token、refresh_token url
      */
-    private static final String REFRESH_TOKEN_URL = BASE_URL + "openWeb/auth/refreshToken";
+//    private static final String REFRESH_TOKEN_URL = BASE_URL + "openWeb/auth/refreshToken";正式
+    private static final String REFRESH_TOKEN_URL = BASE_URL + "openWebIsv/auth/refreshToken"; //测试
 
 
     @Value("${jst.app_key:''}")

fs-service/src/main/java/com/fs/his/service/impl/FsStoreProductServiceImpl.java

@@ -458,7 +458,9 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
     @Transactional
     public R addOrEdit(FsStoreProductAddEditParam param) {
         ProductAttrCountDTO countDto = computedProductCount(param.getValues());
-
+        FsSysConfig sysConfig = configUtil.getSysConfig();
+        Integer erpOpen = sysConfig.getErpOpen();
+        ErpGoods params = new ErpGoods();
         if (param.getProductId() != null) {
             FsStoreProduct product = new FsStoreProduct();
             BeanUtils.copyProperties(param, product);
@@ -511,7 +513,22 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
                     pack.setProductJson(JSON.toJSONString(products));
                     fsPackageService.updateFsPackage(pack);
                 }
+            }
 
+            //todo 添加商品HzOMSerp调用
+            //判断是否开启erp
+            if (erpOpen == null || erpOpen == 0) {
+                //不作操作
+            } else {
+                //判断erp类型
+                Integer erpType = sysConfig.getErpType();
+                if (erpType == null) {
+                    //不作操作
+                } else if (erpType == 5){
+                    //聚水潭商品同步
+                    params.setProductIdList(Arrays.asList(product.getProductId()));
+                    jSTErpGoodsService.addGoods(params);
+                }
             }
         } else {
             FsStoreProduct product = new FsStoreProduct();
@@ -535,10 +552,9 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
             } else {
                 addProductAttr(product.getProductId(), param.getItems(), param.getValues());
             }
+
             //todo 添加商品HzOMSerp调用
             //判断是否开启erp
-            FsSysConfig sysConfig = configUtil.getSysConfig();
-            Integer erpOpen = sysConfig.getErpOpen();
             if (erpOpen == null || erpOpen == 0) {
                 //不作操作
             } else {
@@ -547,19 +563,15 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService {
                 if (erpType == null) {
                     //不作操作
                 } else if (erpType == 3) {
-                    ErpGoods params = new ErpGoods();
                     params.setStoreProductId(product.getProductId());
                     //瀚智OMS 维护添加商品
                     hzOMSErpGoodsService.addGoods(params);
                 }else if (erpType == 5){
                     //聚水潭商品同步
-                    ErpGoods params = new ErpGoods();
                     params.setProductIdList(Arrays.asList(product.getProductId()));
                     jSTErpGoodsService.addGoods(params);
                 }
             }
-
-
         }
         return R.ok();
     }