From 46eed722cd0431aa433bea2470b23015b8d83b3e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 21 二月 2022 10:03:25 +0800
Subject: [PATCH] 优化三亚物业 临时收费问题
---
service-order/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/service-order/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java b/service-order/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java
old mode 100644
new mode 100755
index 2ca0549..1335d31
--- a/service-order/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java
+++ b/service-order/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java
@@ -2,15 +2,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.order.dao.IPrivilegeDAO;
+import com.java110.order.smo.IPrivilegeSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.order.dao.IPrivilegeDAO;
-import com.java110.order.smo.IPrivilegeSMO;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -38,6 +38,7 @@
Assert.isJsonObject(privilegeInfo, "璇锋眰鎶ユ枃涓嶆槸鏈夋晥鐨刯son鏍煎紡");
Assert.jsonObjectHaveKey(privilegeInfo, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId鑺傜偣");
+ Assert.jsonObjectHaveKey(privilegeInfo, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId鑺傜偣");
Assert.jsonObjectHaveKey(privilegeInfo, "storeTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈storeTypeCd鑺傜偣");
@@ -209,15 +210,34 @@
Assert.jsonObjectHaveKey(privilegeInfo, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId鑺傜偣");
- Assert.jsonObjectHaveKey(privilegeInfo, "pId", "璇锋眰鎶ユ枃涓湭鍖呭惈pId鑺傜偣");
+// Assert.jsonObjectHaveKey(privilegeInfo, "pId", "璇锋眰鎶ユ枃涓湭鍖呭惈pId鑺傜偣");
JSONObject privilegeObj = JSONObject.parseObject(privilegeInfo);
//鏍规嵁鏉冮檺缁処D鍜屽晢鎴稩D鏌ヨ鏄惁鏈夋暟鎹�
List<Map> privilegeGroups = privilegeDAOImpl.queryPrivilegeGroup(privilegeObj);
Assert.isNotNull(privilegeGroups, "褰撳墠娌℃湁鏉冮檺鎿嶄綔鏉冮檺缁刾gId = " + privilegeObj.getString("pgId"));
- if (!privilegeDAOImpl.deletePrivilegeRel(privilegeObj)) {
- return new ResponseEntity<String>("鍒犻櫎鏉冮檺澶辫触", HttpStatus.INTERNAL_SERVER_ERROR);
+ if (privilegeObj.containsKey("pIds")) {
+ JSONArray pIds = privilegeObj.getJSONArray("pIds");
+ int errorCount = 0;
+ JSONObject tmpPId = null;
+ for (int pIdIndex = 0; pIdIndex < pIds.size(); pIdIndex++) {
+ try {
+ tmpPId = pIds.getJSONObject(pIdIndex);
+ privilegeObj.put("pId", tmpPId.getString("pId"));
+ if (!privilegeDAOImpl.deletePrivilegeRel(privilegeObj)) {
+ errorCount++;
+ }
+
+ } catch (Exception e) {
+ logger.error("淇濆瓨鏉冮檺鍏崇郴澶辫触", e);
+ errorCount++;
+ }
+ }
+ } else {
+ if (!privilegeDAOImpl.deletePrivilegeRel(privilegeObj)) {
+ return new ResponseEntity<String>("鍒犻櫎鏉冮檺澶辫触", HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
return new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
--
Gitblit v1.8.0