From 65b30b7cac0a3fdcb8cec19c73411af0e2858766 Mon Sep 17 00:00:00 2001
From: 离歌笑 <137273278@qq.com>
Date: 星期二, 22 十月 2019 16:46:20 +0800
Subject: [PATCH] Merge branch 'tlhhup'
---
WebService/src/main/java/com/java110/web/smo/resourceStore/impl/EditResourceStoreSMOImpl.java | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/resourceStore/impl/EditResourceStoreSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/resourceStore/impl/EditResourceStoreSMOImpl.java
index a8aed3e..c8c3084 100644
--- a/WebService/src/main/java/com/java110/web/smo/resourceStore/impl/EditResourceStoreSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/resourceStore/impl/EditResourceStoreSMOImpl.java
@@ -38,8 +38,8 @@
Assert.hasKeyAndValue(paramIn, "resName", "蹇呭～锛岃濉啓鐗╁搧鍚嶇О");
//Assert.hasKeyAndValue(paramIn, "resCode", "蹇呭～锛岃濉啓鐗╁搧缂栫爜");
Assert.hasKeyAndValue(paramIn, "price", "蹇呭～锛岃濉啓鐗╁搧浠锋牸");
- Assert.hasKeyAndValue(paramIn, "stock", "蹇呭～锛岃濉啓鐗╁搧搴撳瓨");
- Assert.hasKeyAndValue(paramIn, "description", "蹇呭～锛岃濉啓鎻忚堪");
+ //Assert.hasKeyAndValue(paramIn, "stock", "蹇呭～锛岃濉啓鐗╁搧搴撳瓨");
+ //Assert.hasKeyAndValue(paramIn, "description", "蹇呭～锛岃濉啓鎻忚堪");
@@ -52,27 +52,6 @@
ResponseEntity<String> responseEntity = null;
ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
paramIn.put("storeId",result.getStoreId());
-
- Map newParamIn = new HashMap();
- newParamIn.put("storeId",result.getStoreId());
- newParamIn.put("resId",paramIn.getString("resId"));
-
- String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/resourceStore.listResourceStores" + mapToUrlParam(paramIn);
-
-
- responseEntity = this.callCenterService(restTemplate, pd, "",
- apiUrl,
- HttpMethod.GET);
-
- if(responseEntity.getStatusCode() != HttpStatus.OK){
- return responseEntity;
- }
-
- JSONArray resourceStores = JSONObject.parseObject(responseEntity.getBody()).getJSONArray("resourceStores");
-
- Assert.isOne(resourceStores,"鏌ヨ鐗╁搧鏁版嵁瀛樺湪澶氭潯鎴�0鏉�");
-
- paramIn.put("stock", resourceStores.getJSONObject(0).getString("stock"));
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/resourceStore.updateResourceStore",
--
Gitblit v1.8.0