Merge remote-tracking branch 'origin/release-201830-wangcz' into release-201830-wangcz

src/main/java/com/uas/platform/b2c/prod/store/facade/impl/StoreApplyFacadeImpl.java

@@ -115,7 +115,7 @@ public class StoreApplyFacadeImpl implements StoreApplyFacade {
 			storeApplyService.handlerApply(storeApply);
 		} else {
 			storeApply.setBannerUrl("http://dfs.ubtob.com/group1/M00/19/BF/CgpkyFlSBRmAcascAANK5vkByag940.jpg");
-			storeApply.setLogoUrl("https://dfs.ubtob.com/group1/M00/88/4D/CgpkyFrMEHeAbmFgAAAVUSwA8go871.png");
+			storeApply.setLogoUrl("https://mall.usoftchina.com/static/img/store/common/default.png");
 			StoreApply savedApply = storeApplyService.handlerApply(storeApply);
 			StoreIn storeIn = storeService.createByStoreApplyAndSave(savedApply);
 			return ResultMap.success(storeIn.getUuid());

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -911,17 +911,17 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         inquiry.setRemark(seekPurchaseBom.getName());
         inquiry.setInquiryItems(inquiryItems);
         String res = "";
+        Map<String, Object> result = new HashMap<>();
         try {
             res = HttpUtil.doPost(url + "/inquiry/buyer/save", FlexJsonUtils.toJsonDeep(inquiry));
             logger.log("bom求购确认发布成功", user.getUserUU() + ",参数:" + FlexJsonUtils.toJsonDeep(inquiry));
+            result.put("successAmount", inquiryItems.size());
+            return ResultMap.success(result);
         } catch (Exception e) {
             logger.log("bom求购确认发布报错", user.getUserUU() + ",错误:" + e.getMessage() + "参数:" + FlexJsonUtils.toJsonDeep(inquiry));
             e.printStackTrace();
-            throw new IllegalOperatorException("发布失败");
+            return new ResultMap(CodeType.SYSTEM_ERROR.code(), "出现异常，发布失败");
         }
-        Map<String, Object> result = new HashMap<>();
-        result.put("successAmount", inquiryItems.size());
-        return ResultMap.success(result);
     }
 
     @Override