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

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtController.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
@@ -341,6 +342,29 @@ public class GoblinStoreMgtController {
         if (!goblinRedisUtils.hasStoreId(currentUid, storeId)) {
             return ResponseDto.failure(ErrorMapping.get("149002"));
         }
+        if (
+                StringUtils.isEmpty(StringUtils.trim(sid)) &&
+                StringUtils.isEmpty(StringUtils.trim(appKey)) &&
+                StringUtils.isEmpty(StringUtils.trim(appSecret)) &&
+                StringUtils.isEmpty(StringUtils.trim(shopNo))
+        ) {
+            sid = StringUtils.trim(sid);
+            appKey = StringUtils.trim(appKey);
+            appSecret = StringUtils.trim(appSecret);
+            shopNo = StringUtils.trim(shopNo);
+        } else if(
+                StringUtils.isNotEmpty(StringUtils.trim(sid)) &&
+                        StringUtils.isNotEmpty(StringUtils.trim(appKey)) &&
+                        StringUtils.isNotEmpty(StringUtils.trim(appSecret)) &&
+                        StringUtils.isNotEmpty(StringUtils.trim(shopNo))
+        ) {
+            sid = StringUtils.trim(sid);
+            appKey = StringUtils.trim(appKey);
+            appSecret = StringUtils.trim(appSecret);
+            shopNo = StringUtils.trim(shopNo);
+        } else {
+            return ResponseDto.failure(ErrorMapping.get("149001"));
+        }
         GoblinStoreErpConfigVo storeErpConfigVo = goblinRedisUtils.getStoreErpConfigVoByStoreId(storeId);
         storeErpConfigVo = null == storeErpConfigVo ? storeErpConfigVo.getNew() : storeErpConfigVo;
         log.info("店铺管理:店铺ERP配置:编辑[UID:{},BEF:{}]", currentUid, JsonUtils.toJson(storeErpConfigVo));

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -460,7 +460,7 @@ public class GoblinMongoUtils {
     /* ---------------------------------------- 店铺ERP配置数据源 ---------------------------------------- */
 
     public List<String> getStoreErpShopNoList() {
-        Query query = Query.query(Criteria.where("shopNo").ne(""));
+        Query query = Query.query(Criteria.where("shopNo").exists(true).and("shopNo").ne(""));
         query.fields().include("shopNo");
         List<GoblinStoreErpConfigVo> vos = mongoTemplate.find(query, GoblinStoreErpConfigVo.class, GoblinStoreErpConfigVo.class.getSimpleName());
         if (!CollectionUtils.isEmpty(vos)) {