From d3ba300ef41e3c0161a71abe1582a16969a6b0ba Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 21 六月 2023 00:28:45 +0800
Subject: [PATCH] 删除pagehelper
---
springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
index 9ed8433..f7236a2 100644
--- a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
+++ b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
@@ -7,10 +7,10 @@
import com.java110.core.context.IPageData;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.store.StoreDto;
import com.java110.dto.user.UserDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.cache.PrivilegeCache;
@@ -38,7 +38,6 @@
private static final String URL_API = "";
-
@Autowired
private WechatAuthProperties wechatAuthProperties;
@@ -50,6 +49,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+ @Autowired
+ private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
//寰俊鏀粯
public static final String DOMAIN_WECHAT_PAY = "WECHAT_PAY";
@@ -92,11 +94,12 @@
headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
- if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
- headers.put(CommonConstant.HTTP_USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
- }
if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
+
+ }
+ if (!headers.containsKey(CommonConstant.APP_ID)) {
+ headers.put(CommonConstant.APP_ID, pd.getAppId());
}
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
@@ -148,10 +151,8 @@
headers.put(CommonConstant.HTTP_USER_ID, "-1");
}
- headers.put(CommonConstant.USER_ID, "-1");
-
- if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
- headers.put(CommonConstant.HTTP_USER_ID, "-1");
+ if (!headers.containsKey(CommonConstant.USER_ID)) {
+ headers.put(CommonConstant.USER_ID, "-1");
}
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
@@ -379,13 +380,13 @@
protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate) {
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
- ResultVo resultVo = null;
-
+ ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreInfo(pd, restTemplate, pd.getUserId());
+ logger.debug("ruleId getStoreInfo 锛歿}", resultVo.toString());
return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
}
private ResponseEntity<String> getStoreEnterCommunitys(IPageData pd, String storeId, String storeTypeCd, RestTemplate restTemplate) {
- ResultVo resultVo = null;
+ ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreEnterCommunitys(pd, storeId, storeTypeCd, restTemplate);
return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
}
--
Gitblit v1.8.0