From 87f19e0894585ad0f378ac2fbc229ee7ca933670 Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期三, 17 七月 2019 11:04:43 +0800
Subject: [PATCH] 完善了照片和开发者自述修改一些页面的显示的按钮
---
OrderService/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/OrderService/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java b/OrderService/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java
index ffe24d6..7489369 100644
--- a/OrderService/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java
+++ b/OrderService/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java
@@ -194,7 +194,7 @@
String pFlag = privilegeObj.getString("pFlag");//鏉冮檺缁�
privilegeObj.put("privilegeFlag","1".equals(pFlag)?"1":"0");
List<Map> privilegeGroups = privilegeDAOImpl.queryUserPrivilege(privilegeObj);
- Assert.isNull(privilegeGroups, "宸茬粡瀛樺湪璇ユ潈闄愭棤闇�澶氭娣诲姞" + privilegeInfo);
+ Assert.listIsNull(privilegeGroups, "宸茬粡瀛樺湪璇ユ潈闄愭棤闇�澶氭娣诲姞" + privilegeInfo);
if (!privilegeDAOImpl.addUserPrivilege(privilegeObj)) {
return new ResponseEntity<String>("娣诲姞鏉冮檺澶辫触", HttpStatus.INTERNAL_SERVER_ERROR);
@@ -203,6 +203,56 @@
return new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
}
+ /**
+ * 鍒犻櫎鍛樺伐鏉冮檺
+ * @param privilegeInfo
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> deleteStaffPrivilegeOrPrivilegeGroup(String privilegeInfo) {
+ JSONObject privilegeObj = validateDeleteStaffPrivilegeData(privilegeInfo);
+ //鏍规嵁鏉冮檺缁処D鍜屽晢鎴稩D鏌ヨ鏄惁鏈夋暟鎹�
+ String pFlag = privilegeObj.getString("pFlag");//鏉冮檺缁�
+ privilegeObj.put("privilegeFlag","1".equals(pFlag)?"1":"0");
+ List<Map> privilegeGroups = privilegeDAOImpl.queryUserPrivilege(privilegeObj);
+ Assert.isNotNull(privilegeGroups, "涓嶅瓨鍦ㄨ鏉冮檺" + privilegeInfo);
+
+ if (!privilegeDAOImpl.deleteUserPrivilege(privilegeObj)) {
+ return new ResponseEntity<String>("娣诲姞鏉冮檺澶辫触", HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
+ return new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
+ }
+
+ /**
+ * 鏁版嵁鏍￠獙
+ * @param privilegeInfo
+ * @return
+ */
+ private JSONObject validateDeleteStaffPrivilegeData(String privilegeInfo) {
+
+ Assert.isJsonObject(privilegeInfo, "璇锋眰鎶ユ枃涓嶆槸鏈夋晥鐨刯son鏍煎紡");
+
+ Assert.jsonObjectHaveKey(privilegeInfo, "pId", "璇锋眰鎶ユ枃涓湭鍖呭惈pId鑺傜偣");
+
+ Assert.jsonObjectHaveKey(privilegeInfo, "pFlag", "璇锋眰鎶ユ枃涓湭鍖呭惈pFlag鑺傜偣");
+
+ Assert.jsonObjectHaveKey(privilegeInfo, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId鑺傜偣");
+
+ Assert.jsonObjectHaveKey(privilegeInfo, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId鑺傜偣");
+
+ Assert.jsonObjectHaveKey(privilegeInfo, "storeTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈storeTypeCd鑺傜偣");
+
+ JSONObject privilegeObj = JSONObject.parseObject(privilegeInfo);
+ String pFlag = privilegeObj.getString("pFlag");//鏉冮檺缁�
+ if("1".equals(pFlag)){
+ validatePrivilegeGroup(privilegeObj);
+ return privilegeObj;
+ }
+ validatePrivilege(privilegeObj);
+ return privilegeObj;
+ }
+
private JSONObject validateData(String privilegeInfo) {
Assert.isJsonObject(privilegeInfo, "璇锋眰鎶ユ枃涓嶆槸鏈夋晥鐨刯son鏍煎紡");
--
Gitblit v1.8.0