From 812f07d296db24ab960e2f69c21142019342f61b Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期六, 22 六月 2019 17:05:11 +0800
Subject: [PATCH] Merge branch 'shiyj01'
---
WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java | 26 ++------------------------
Api/src/main/java/com/java110/api/listener/demo/SaveDemoConfigListener.java | 4 ++--
2 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/demo/SaveDemoConfigListener.java b/Api/src/main/java/com/java110/api/listener/demo/SaveDemoConfigListener.java
index dec167a..dcfd3bf 100644
--- a/Api/src/main/java/com/java110/api/listener/demo/SaveDemoConfigListener.java
+++ b/Api/src/main/java/com/java110/api/listener/demo/SaveDemoConfigListener.java
@@ -67,8 +67,8 @@
dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
JSONArray businesses = new JSONArray();
- //娣诲姞鍗曞厓淇℃伅
- //businesses.add(addFeeConfig(paramObj, dataFlowContext));
+ //娣诲姞DEMO淇℃伅
+ businesses.add(addFeeConfig(paramObj, dataFlowContext));
JSONObject paramInObj = super.restToCenterProtocol(businesses, dataFlowContext.getRequestCurrentHeaders());
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java
index b5c6362..44688fb 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/DemoServiceSMOImpl.java
@@ -213,31 +213,9 @@
*/
private void validateSaveCar(IPageData pd) {
- Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈carNum");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carBrand", "璇锋眰鎶ユ枃涓湭鍖呭惈carBrand");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carType", "璇锋眰鎶ユ枃涓湭鍖呭惈carType");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carColor", "鏈寘鍚玞arColor");
- Assert.jsonObjectHaveKey(pd.getReqData(), "psId", "鏈寘鍚玴sId");
- Assert.jsonObjectHaveKey(pd.getReqData(), "receivedAmount", "鏈寘鍚玶eceivedAmount");
- Assert.jsonObjectHaveKey(pd.getReqData(), "sellOrHire", "鏈寘鍚玸ellOrHire");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "demoName", "鏈寘鍚玠emoName");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "demoValue", "鏈寘鍚玠emoValue");
- JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
- Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("ownerId"), "ownerId涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("psId"), "psId涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("receivedAmount"), "receivedAmount涓嶈兘涓虹┖");
-
- if(!"H".equals(paramIn.getString("sellOrHire"))
- && !"S".equals(paramIn.getString("sellOrHire"))){
- throw new IllegalArgumentException("鍏ュ弬閿欒锛屾棤娉曡瘑鍒鎿嶄綔");
- }
-
- if("H".equals(paramIn.getString("sellOrHire"))){
- Assert.jsonObjectHaveKey(pd.getReqData(), "cycles", "鏈寘鍚玞ycles");
- Assert.hasLength(paramIn.getString("cycles"), "cycles涓嶈兘涓虹┖");
- }
}
/**
--
Gitblit v1.8.0