From c54b2f12e52194f2ea226b3ee4b91e5d202b1338 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 03 六月 2021 16:54:16 +0800
Subject: [PATCH] 优化app 支付报错问题
---
service-front/src/main/java/com/java110/front/smo/impl/PrivilegeServiceSMOImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 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 5f2e440..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
@@ -2,11 +2,14 @@
import com.alibaba.fastjson.JSONArray;
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.core.context.IPageData;
-import com.java110.core.component.BaseComponentSMO;
-import com.java110.front.smo.IPrivilegeServiceSMO;
+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;
@@ -19,6 +22,9 @@
@Autowired
private RestTemplate restTemplate;
+
+ @Autowired
+ private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
/**
* 鏌ヨ 鏉冮檺缁�
@@ -223,10 +229,34 @@
return privileges;
}
+
JSONObject resultObj = JSONObject.parseObject(privileges.getBody().toString());
+ JSONArray privilegeArrays = resultObj.getJSONArray("privileges");
+ JSONObject privilegeObj = null;
- return new ResponseEntity<String>(resultObj.getJSONArray("privileges").toJSONString(), HttpStatus.OK);
+ JSONArray tmpPrivilegeArrays = new JSONArray();
+
+ for (int privilegeIndex = 0; privilegeIndex < privilegeArrays.size(); privilegeIndex++) {
+ privilegeObj = privilegeArrays.getJSONObject(privilegeIndex);
+ hasSameData(privilegeObj, tmpPrivilegeArrays);
+ }
+ return new ResponseEntity<String>(tmpPrivilegeArrays.toJSONString(), HttpStatus.OK);
+ }
+
+ private void hasSameData(JSONObject privilegeObj, JSONArray tmpPrivilegeArrays) {
+ JSONObject tmpPrivilegeObj = null;
+ for (int tmpPrivilegeIndex = 0; tmpPrivilegeIndex < tmpPrivilegeArrays.size(); tmpPrivilegeIndex++) {
+ tmpPrivilegeObj = tmpPrivilegeArrays.getJSONObject(tmpPrivilegeIndex);
+ if (privilegeObj.getString("pId").equals(tmpPrivilegeObj.getString("pId"))) {
+ if (!StringUtil.isEmpty(privilegeObj.getString("pgId"))) {
+ tmpPrivilegeArrays.remove(tmpPrivilegeIndex);
+ tmpPrivilegeArrays.add(privilegeObj);
+ }
+ return;
+ }
+ }
+ tmpPrivilegeArrays.add(privilegeObj);
}
@Override
@@ -297,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);
@@ -312,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;
}
@@ -319,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