|
@@ -218,38 +218,6 @@ public class TJoinpayMchController {
|
|
@GetMapping("/getMch")
|
|
@GetMapping("/getMch")
|
|
public ResponseModel<TJoinpayMch> getMch(@RequestParam String id) {
|
|
public ResponseModel<TJoinpayMch> getMch(@RequestParam String id) {
|
|
TAdmin admin = adminService.getById(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);
|
|
|
|
-// }
|
|
|
|
-// }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){
|
|
if(admin.getType()<=1){
|
|
//公司
|
|
//公司
|
|
TJoinpayMch tJoinpayMch = new TJoinpayMch();
|
|
TJoinpayMch tJoinpayMch = new TJoinpayMch();
|