소스 검색

fix:“优化提现账号查询接口“

soobin 1 년 전
부모
커밋
b3d04faaad
1개의 변경된 파일38개의 추가작업 그리고 20개의 파일을 삭제
  1. 38 20
      src/main/java/com/szwl/controller/TJoinpayMchController.java

+ 38 - 20
src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -218,29 +218,47 @@ public class TJoinpayMchController {
     @GetMapping("/getMch")
     public ResponseModel<TJoinpayMch> getMch(@RequestParam String id) {
         TAdmin admin = adminService.getById(id);
-        if(!admin.getIsAdmined()){
-            if(admin.getType()<=1){
-                //公司
-                TJoinpayMch tJoinpayMch = new TJoinpayMch();
-                tJoinpayMch.setType("0");
-                return R.ok(tJoinpayMch);
-            }else {
-                //商家
-                TAdmin parentAdmin = adminService.getById(admin.getParentId());
-                LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
-                query.eq(TJoinpayMch::getAdminId,Long.valueOf(parentAdmin.getId()));
-                List<TJoinpayMch> list = tJoinpayMchService.list(query);
-                TJoinpayMch tJoinpayMch = list.get(0);
-                tJoinpayMchService.refreshMch(tJoinpayMch);
-                String s = tJoinpayMchService.refreshMyAccount(tJoinpayMch);
-                TJoinpayMch joinpayMch = tJoinpayMchService.getById(tJoinpayMch.getId());
-                return R.ok(joinpayMch);
-            }
+//        if(!admin.getIsAdmined()){
+//            if(admin.getType()<=1){
+//                //公司
+//                TJoinpayMch tJoinpayMch = new TJoinpayMch();
+//                tJoinpayMch.setType("0");
+//                return R.ok(tJoinpayMch);
+//            }else {
+//                //商家
+//                TAdmin parentAdmin = adminService.getById(admin.getParentId());
+//                LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
+//                query.eq(TJoinpayMch::getAdminId,Long.valueOf(parentAdmin.getId()));
+//                List<TJoinpayMch> list = tJoinpayMchService.list(query);
+//                TJoinpayMch tJoinpayMch = list.get(0);
+//                tJoinpayMchService.refreshMch(tJoinpayMch);
+//                String s = tJoinpayMchService.refreshMyAccount(tJoinpayMch);
+//                TJoinpayMch joinpayMch = tJoinpayMchService.getById(tJoinpayMch.getId());
+//                return R.ok(joinpayMch);
+//            }
+//        }else {
+//            LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
+//            query.eq(TJoinpayMch::getAdminId,Long.valueOf(id));
+////            List<TJoinpayMch> list = tJoinpayMchService.list(query);
+////            TJoinpayMch tJoinpayMch = list.get(0);
+//            TJoinpayMch tJoinpayMch = tJoinpayMchService.getOne(query);
+//            if(tJoinpayMch == null) {
+//                return R.ok(null);
+//            }
+//            tJoinpayMchService.refreshMch(tJoinpayMch);
+//            tJoinpayMchService.refreshMyAccount(tJoinpayMch);
+//            TJoinpayMch joinpayMch = tJoinpayMchService.getById(tJoinpayMch.getId());
+//            return R.ok(joinpayMch);
+//        }
+        if(admin.getType()<=1){
+            //公司
+            TJoinpayMch tJoinpayMch = new TJoinpayMch();
+            tJoinpayMch.setType("0");
+            return R.ok(tJoinpayMch);
         }else {
+            //商家
             LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
             query.eq(TJoinpayMch::getAdminId,Long.valueOf(id));
-//            List<TJoinpayMch> list = tJoinpayMchService.list(query);
-//            TJoinpayMch tJoinpayMch = list.get(0);
             TJoinpayMch tJoinpayMch = tJoinpayMchService.getOne(query);
             if(tJoinpayMch == null) {
                 return R.ok(null);