From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java
old mode 100644
new mode 100755
index cd5165d..7f6261a
--- a/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java
@@ -4,10 +4,12 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.smo.IGetCommunityStoreInfoSMO;
import com.java110.front.smo.IPrivilegeServiceSMO;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -20,6 +22,9 @@
@Autowired
private RestTemplate restTemplate;
+
+ @Autowired
+ private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
/**
* 鏌ヨ 鏉冮檺缁�
@@ -295,7 +300,7 @@
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
Assert.jsonObjectHaveKey(privilegeInfoObj, "pgId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺缁処D 鑺傜偣");
- Assert.jsonObjectHaveKey(privilegeInfoObj, "pId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺ID 鑺傜偣");
+ //Assert.jsonObjectHaveKey(privilegeInfoObj, "pId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏉冮檺ID 鑺傜偣");
ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
@@ -322,7 +327,11 @@
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
JSONObject privilegeInfoObj = JSONObject.parseObject(pd.getReqData());
- Assert.jsonObjectHaveKey(privilegeInfoObj, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍛樺伐ID 鑺傜偣");
+ //Assert.jsonObjectHaveKey(privilegeInfoObj, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍛樺伐ID 鑺傜偣");
+
+ if (!privilegeInfoObj.containsKey("staffId")) {
+ privilegeInfoObj.put("staffId", pd.getUserId());
+ }
ResponseEntity<String> storeInfo = super.getStoreInfo(pd, restTemplate);
@@ -337,6 +346,9 @@
ResponseEntity<String> privilegeGroup = super.callCenterService(restTemplate, pd, "",
ServiceConstant.SERVICE_API_URL + "/api/query.user.privilege?userId=" + privilegeInfoObj.getString("staffId") + "&domain=" + storeInfoObj.getString("storeTypeCd"), HttpMethod.GET);
+
+// ResultVo resultVo = getCommunityStoreInfoSMOImpl.getUserPrivileges(pd, privilegeInfoObj.getString("staffId"), storeInfoObj.getString("storeTypeCd"), restTemplate);
+// ResponseEntity<String> privilegeGroup = new ResponseEntity<>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
return privilegeGroup;
}
@@ -344,6 +356,14 @@
JSONArray privileges = resultObj.getJSONArray("privileges");
+ JSONArray tmpPrivilegeArrays = new JSONArray();
+
+ JSONObject privilegeObj = null;
+ for (int privilegeIndex = 0; privilegeIndex < privileges.size(); privilegeIndex++) {
+ privilegeObj = privileges.getJSONObject(privilegeIndex);
+ hasSameData(privilegeObj, tmpPrivilegeArrays);
+ }
+
JSONObject resObj = new JSONObject();
resObj.put("datas", privileges);
--
Gitblit v1.8.0