Explorar el Código

로그인시 세션에 결재가능여부 값과 mallid값 전송

dwkim hace 2 años
padre
commit
e3755b4f27

+ 3 - 0
src/main/java/com/oqpo/api/entity/oper/MemberEntity.java

@@ -49,6 +49,9 @@ public class MemberEntity implements Serializable, UserDetails {
49 49
     private String appReg;
50 50
     private String appVer;
51 51
 
52
+    private String apprYn;
53
+    private String mallId;
54
+
52 55
     private Collection<? extends GrantedAuthority> authorities;
53 56
 
54 57
     @Override

+ 38 - 0
src/main/java/com/oqpo/api/service/SessionService.java

@@ -6,6 +6,7 @@ import com.oqpo.api.entity.stinfo.BrandEntity;
6 6
 import com.oqpo.api.enums.SystemMessageCode;
7 7
 import com.oqpo.api.exception.GlobalException;
8 8
 import com.oqpo.api.mapper.MemberMapper;
9
+import com.oqpo.api.mapper.stinfo.BrandMapper;
9 10
 import com.oqpo.api.service.oper.AfflService;
10 11
 import com.oqpo.api.service.oper.UserMngService;
11 12
 import com.oqpo.api.service.stinfo.BrandService;
@@ -51,6 +52,9 @@ public class SessionService extends CommonService {
51 52
     @Autowired
52 53
     private MemberMapper memberMapper;
53 54
 
55
+    @Autowired
56
+    private BrandMapper brandMapper;
57
+
54 58
 
55 59
 
56 60
     public SessionResponse data(HttpServletRequest request) throws Exception {
@@ -75,6 +79,23 @@ public class SessionService extends CommonService {
75 79
             memberEntity.setOqBrandId(groupInfo.getOqBrandId());
76 80
             memberEntity.setOqStoreId(groupInfo.getOqStoreId());
77 81
 
82
+            // 권한이 매장이면 결재가능여부 정보 및 mallId 값 전송
83
+            if ("50".equals(memberEntity.getAuthTpCd())) {
84
+                // 매장  selectBrandPgInfo
85
+                BrandEntity pgEntity = brandMapper.selectBrandPgInfo(memberEntity.getBrandId());
86
+                if ("".toString().equals(pgEntity.getMallId())) {
87
+                    memberEntity.setApprYn("N");
88
+                    memberEntity.setMallId("");
89
+                } else {
90
+                    memberEntity.setApprYn("Y");
91
+                    memberEntity.setMallId(pgEntity.getMallId());
92
+                }
93
+
94
+            } else {
95
+                memberEntity.setApprYn("N");
96
+                memberEntity.setMallId("");
97
+            }
98
+
78 99
             // 사용자정보 가져오기
79 100
             //if ("60".equals(memberEntity.getAuthTpCd())) {
80 101
                 // 공급사로 - 공급사 테이블에서 공급사아이디와 공급사명 가져오기
@@ -116,6 +137,23 @@ public class SessionService extends CommonService {
116 137
                 memberEntity.setBrandId(jwtTokenProvider.getBrandId(connKey));
117 138
             }
118 139
 
140
+            // 권한이 매장이면 결재가능여부 정보 및 mallId 값 전송
141
+            if ("50".equals(memberEntity.getAuthTpCd())) {
142
+                // 매장  selectBrandPgInfo
143
+                BrandEntity pgEntity = brandMapper.selectBrandPgInfo(memberEntity.getBrandId());
144
+                if ("".toString().equals(pgEntity.getMallId())) {
145
+                    memberEntity.setApprYn("N");
146
+                    memberEntity.setMallId("");
147
+                } else {
148
+                    memberEntity.setApprYn("Y");
149
+                    memberEntity.setMallId(pgEntity.getMallId());
150
+                }
151
+
152
+            } else {
153
+                memberEntity.setApprYn("N");
154
+                memberEntity.setMallId("");
155
+            }
156
+
119 157
         } catch (Exception e) {
120 158
             e.getStackTrace();
121 159
             throw new GlobalException(SystemMessageCode.NEED_AUTH);

+ 7 - 0
src/main/java/com/oqpo/api/web/dto/response/session/SessionResponse.java

@@ -52,6 +52,8 @@ public class SessionResponse {
52 52
                         .setSystemAdminYn(StringUtils.isBlank(entity.getSystemAdminYn()) ? "N" : entity.getSystemAdminYn())
53 53
                         .oqBrandId(entity.getOqBrandId() == null ? "" : entity.getOqBrandId())
54 54
                         .oqStoreId(entity.getOqStoreId() == null ? "" : entity.getOqStoreId())
55
+                        .apprYn(entity.getApprYn() == null ? "N" : entity.getApprYn())
56
+                        .mallId(entity.getMallId() == null ? "" : entity.getMallId())
55 57
                         .build())
56 58
                 .codeList(codeList.stream()
57 59
                         .map(m -> CodeInfo.builder()
@@ -239,6 +241,11 @@ public class SessionResponse {
239 241
         @ApiModelProperty(value = "오더퀸 매장코드")
240 242
         private String oqStoreId;
241 243
 
244
+        @ApiModelProperty(value = "카드결재가능여부")
245
+        private String apprYn;
246
+
247
+        @ApiModelProperty(value = "카드결재MallId")
248
+        private String mallId;
242 249
     }
243 250
 
244 251
 }