Merge remote-tracking branch 'origin/test' into test

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -66,8 +66,8 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
 
         // 特别包含需要进行TOKEN检查的路径
         for (String path : new String[]{
-                "/tAdmin/getAdminList", "/tAdmin/getRelation", "/tAdmin/getAdminOne/**",
-                "/tJoinpayMch/getOne", "/tJoinpayMch/getMch",
+                "/tAdmin/getAdminList", "/tAdmin/getRelation",
+                "/tJoinpayMch/getOne",
                 "/tEquipment/findList"
         }) {
             registry.addInterceptor(headTokenInterceptor)

src/main/java/com/szwl/controller/TAdminController.java

@@ -951,10 +951,10 @@ public class TAdminController {
     @ApiOperation(value = "获取admin信息")
     @GetMapping("/getAdminOne/{adminId}")
     public ResponseModel<TAdmin> getAdminOne(@PathVariable Long adminId) {
-        UserDetailBO userDetailBO = Optional.ofNullable(tokenManager.getLoginUserDetails())
-                .orElseThrow(() -> new BizException(ResponseCodesEnum.L0001));
-        String id = userDetailBO.getId().toString();
-        TAdmin admin = tAdminService.getById(id);
+//        UserDetailBO userDetailBO = Optional.ofNullable(tokenManager.getLoginUserDetails())
+//                .orElseThrow(() -> new BizException(ResponseCodesEnum.L0001));
+//        String id = userDetailBO.getId().toString();
+        TAdmin admin = tAdminService.getById(adminId);
         if (Objects.isNull(admin)) {
             return R.fail("当前用户不存在");
         }

src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -63,33 +63,33 @@ public class TJoinpayMchController {
 
 //        TAdmin admin = adminService.getById(adminId);
         LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
-        query.eq(TJoinpayMch::getAdminId,adminId);
+        query.eq(TJoinpayMch::getAdminId, adminId);
         List<TJoinpayMch> list = tJoinpayMchService.list(query);
-        if(list.size()>0){
+        if (list.size() > 0) {
             //已经注册，就要查看是否有提交审核的
             LambdaQueryWrapper<TJoinpayMchCheck> query1 = Wrappers.lambdaQuery();
-            query1.eq(TJoinpayMchCheck::getAdminId,adminId);
+            query1.eq(TJoinpayMchCheck::getAdminId, adminId);
             List<TJoinpayMchCheck> list1 = tJoinpayMchCheckService.list(query1);
-            if(list1.size()>0){
+            if (list1.size() > 0) {
                 int i = 0;
-                for(TJoinpayMchCheck tJoinpayMchCheck:list1){
-                    if(tJoinpayMchCheck.getType().equals("0")||tJoinpayMchCheck.getType().equals("3")){
+                for (TJoinpayMchCheck tJoinpayMchCheck : list1) {
+                    if (tJoinpayMchCheck.getType().equals("0") || tJoinpayMchCheck.getType().equals("3")) {
                         i++;
                     }
                 }
-                if(i==0){
+                if (i == 0) {
                     return R.ok(list.get(0));
-                }else {
-                    for(int j=list1.size()-1;j>=0;j--){
-                        if(!list1.get(j).getType().equals("2")&!list1.get(j).getType().equals("1")){
-                            if(list1.get(j).getType().equals("3")){
+                } else {
+                    for (int j = list1.size() - 1; j >= 0; j--) {
+                        if (!list1.get(j).getType().equals("2") & !list1.get(j).getType().equals("1")) {
+                            if (list1.get(j).getType().equals("3")) {
                                 Date data = new Date();
                                 long time = data.getTime();
                                 long updateTime = list1.get(j).getModifyDate().getTime();
-                                if(3*24*60*60*1000l>time-updateTime){
+                                if (3 * 24 * 60 * 60 * 1000l > time - updateTime) {
                                     //拒绝的审核，超过3天后不显示
                                     return R.ok(list.get(0));
-                                }else {
+                                } else {
                                     return R.ok(list.get(j));
                                 }
                             }
@@ -97,35 +97,36 @@ public class TJoinpayMchController {
                         }
                     }
                 }
-            }else {
+            } else {
                 return R.ok(list.get(0));
             }
             return R.ok(list.get(0));
-        }else {
+        } else {
             return R.fail("尚未注册！");
         }
     }
+
     @ApiOperation(value = "保存或提交审核")
     @PostMapping("/save")
     public ResponseModel<?> save(@RequestBody TJoinpayMch tJoinpayMch) {
 
         LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
-        query.eq(TJoinpayMch::getAdminId,tJoinpayMch.getAdminId());
+        query.eq(TJoinpayMch::getAdminId, tJoinpayMch.getAdminId());
         List<TJoinpayMch> list = tJoinpayMchService.list(query);
         tJoinpayMch.setCreateDate(new Date());
         tJoinpayMch.setModifyDate(new Date());
-        if(list.size()>0&&StringUtils.isNotEmpty(list.get(0).getAltMchNo())){
+        if (list.size() > 0 && StringUtils.isNotEmpty(list.get(0).getAltMchNo())) {
             //已有，属于第二次提交信息，
             TJoinpayMch mch = list.get(0);
             //取消审核步骤
 //            ResponseModel<?> checkMch = createCheckMch(mch, tJoinpayMch);
             //提交并修改
-            if(StringUtils.isNotEmpty(mch.getApproveStatus())) {
-                if(!mch.getApproveStatus().equals("审核通过")){
+            if (StringUtils.isNotEmpty(mch.getApproveStatus())) {
+                if (!mch.getApproveStatus().equals("审核通过")) {
                     if (!StringUtils.isEmpty(tJoinpayMch.getLegalPerson())) {
                         mch.setLegalPerson(tJoinpayMch.getLegalPerson());
                     }
-                    if (tJoinpayMch.getIdCardNo()!=null) {
+                    if (tJoinpayMch.getIdCardNo() != null) {
                         mch.setIdCardNo(tJoinpayMch.getIdCardNo());
                     }
                     if (!StringUtils.isEmpty(tJoinpayMch.getLicenseNo())) {
@@ -153,62 +154,64 @@ public class TJoinpayMchController {
                 mch.setPhoneNo(tJoinpayMch.getPhoneNo());
             }
 
-            if(mch.getSettMode()!=null){
+            if (mch.getSettMode() != null) {
                 mch.setSettMode(tJoinpayMch.getSettMode());
             }
-            if(mch.getRiskDay()!=null){
+            if (mch.getRiskDay() != null) {
                 mch.setRiskDay(tJoinpayMch.getRiskDay());
             }
-            if (tJoinpayMch.getSettDateType()!=null) {
+            if (tJoinpayMch.getSettDateType() != null) {
                 mch.setSettDateType(tJoinpayMch.getSettDateType());
             }
             String s = tJoinpayMchService.updateMch(mch);
-            if(s.equals("ok")){
+            if (s.equals("ok")) {
                 tJoinpayMchService.updateById(mch);
             }
-            return  R.ok(s);
-        }else {
+            return R.ok(s);
+        } else {
             //没有，直接保存
             tJoinpayMch.setStep("0");
 
             String result = tJoinpayMchService.createMch(tJoinpayMch);
-            if(result.equals("ok")){
+            if (result.equals("ok")) {
                 return R.ok(tJoinpayMch);
-            }else {
-                return R.fail(ResponseCodesEnum.C0001,result);
+            } else {
+                return R.fail(ResponseCodesEnum.C0001, result);
             }
 
         }
     }
+
     @ApiOperation(value = "签约")
     @GetMapping("/altMchSign")
     public ResponseModel<?> altMchSign(String id) {
         TJoinpayMch mch = tJoinpayMchService.getById(id);
         //签定协议
-        String str =tJoinpayMchService.altMchSign(mch);
+        String str = tJoinpayMchService.altMchSign(mch);
         return R.ok(str);
     }
+
     @ApiOperation(value = "上传图片")
     @PostMapping("/sentImage")
 //    public ResponseModel<?> sentImage(String id,String cardPositive,String cardNegative,String tradeLicence,String openAccountLicence,String type,String status) {
     public ResponseModel<?> sentImage(@RequestBody mchParam tJoinpayMch) {
         TJoinpayMch mch = tJoinpayMchService.getById(tJoinpayMch.getId());
-        if(tJoinpayMch.getType().equals("0")){
+        if (tJoinpayMch.getType().equals("0")) {
             //对公
-            if(StringUtils.isEmpty(tJoinpayMch.getCardPositive())||StringUtils.isEmpty(tJoinpayMch.getCardNegative())||StringUtils.isEmpty(tJoinpayMch.getTradeLicence())){
+            if (StringUtils.isEmpty(tJoinpayMch.getCardPositive()) || StringUtils.isEmpty(tJoinpayMch.getCardNegative()) || StringUtils.isEmpty(tJoinpayMch.getTradeLicence())) {
                 return R.fail("图片不能为空");
             }
-            String str = tJoinpayMchService.sendCardBusiness(mch,tJoinpayMch.getCardPositive(),tJoinpayMch.getCardNegative(),tJoinpayMch.getTradeLicence(),tJoinpayMch.getOpenAccountLicence(),tJoinpayMch.getStatus());
+            String str = tJoinpayMchService.sendCardBusiness(mch, tJoinpayMch.getCardPositive(), tJoinpayMch.getCardNegative(), tJoinpayMch.getTradeLicence(), tJoinpayMch.getOpenAccountLicence(), tJoinpayMch.getStatus());
             return R.ok(str);
         }
-        if(tJoinpayMch.getType().equals("1")){
+        if (tJoinpayMch.getType().equals("1")) {
             //个人
-            if(StringUtils.isEmpty(tJoinpayMch.getCardPositive())||StringUtils.isEmpty(tJoinpayMch.getCardNegative())){
+            if (StringUtils.isEmpty(tJoinpayMch.getCardPositive()) || StringUtils.isEmpty(tJoinpayMch.getCardNegative())) {
                 return R.fail("图片不能为空");
             }
 //            String  cardNegative = replit(tJoinpayMch.getCardNegative());
 //            String cardPositive = replit(tJoinpayMch.getCardPositive());
-            String str = tJoinpayMchService.sendCard(mch,tJoinpayMch.getCardPositive(),tJoinpayMch.getCardNegative(),tJoinpayMch.getStatus());
+            String str = tJoinpayMchService.sendCard(mch, tJoinpayMch.getCardPositive(), tJoinpayMch.getCardNegative(), tJoinpayMch.getStatus());
             return R.ok(str);
         }
         return R.ok();
@@ -228,21 +231,21 @@ public class TJoinpayMchController {
     @ApiOperation(value = "获取提现信息")
     @GetMapping("/getMch")
     public ResponseModel<TJoinpayMch> getMch(@RequestParam String id) {
-        UserDetailBO userDetailBO = Optional.ofNullable(tokenManager.getLoginUserDetails())
-                .orElseThrow(() -> new BizException(ResponseCodesEnum.L0001));
-        String adminId = userDetailBO.getId().toString();
-        TAdmin admin = adminService.getById(adminId);
-        if(admin.getType()<=1){
+//        UserDetailBO userDetailBO = Optional.ofNullable(tokenManager.getLoginUserDetails())
+//                .orElseThrow(() -> new BizException(ResponseCodesEnum.L0001));
+//        String adminId = userDetailBO.getId().toString();
+        TAdmin admin = adminService.getById(id);
+        if (admin.getType() <= 1) {
             //公司
             TJoinpayMch tJoinpayMch = new TJoinpayMch();
             tJoinpayMch.setType("0");
             return R.ok(tJoinpayMch);
-        }else {
+        } else {
             //商家
             LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
-            query.eq(TJoinpayMch::getAdminId,Long.valueOf(adminId));
+            query.eq(TJoinpayMch::getAdminId, Long.valueOf(id));
             TJoinpayMch tJoinpayMch = tJoinpayMchService.getOne(query);
-            if(tJoinpayMch == null) {
+            if (tJoinpayMch == null) {
                 return R.ok(null);
             }
             tJoinpayMchService.refreshMch(tJoinpayMch);
@@ -256,29 +259,29 @@ public class TJoinpayMchController {
     private ResponseModel<?> createCheckMch(TJoinpayMch mch, TJoinpayMch tJoinpayMch) {
         //检查是否有更新
         int a = 0;
-        if(!mch.getBankAccountNo().equals(tJoinpayMch.getBankAccountNo())){
+        if (!mch.getBankAccountNo().equals(tJoinpayMch.getBankAccountNo())) {
             a++;
         }
-        if(!mch.getBusiContactName().equals(tJoinpayMch.getBusiContactName())){
+        if (!mch.getBusiContactName().equals(tJoinpayMch.getBusiContactName())) {
             a++;
         }
-        if(!mch.getIdCardNo().equals(tJoinpayMch.getIdCardNo())){
+        if (!mch.getIdCardNo().equals(tJoinpayMch.getIdCardNo())) {
             a++;
         }
-        if(mch.getSettMode()!=null&&tJoinpayMch.getSettMode()!=null&mch.getSettMode()!=tJoinpayMch.getSettMode()){
+        if (mch.getSettMode() != null && tJoinpayMch.getSettMode() != null & mch.getSettMode() != tJoinpayMch.getSettMode()) {
             a++;
         }
-        if(mch.getAltMerchantType()!=tJoinpayMch.getAltMerchantType()){
+        if (mch.getAltMerchantType() != tJoinpayMch.getAltMerchantType()) {
             a++;
         }
-        if(a<=0){
+        if (a <= 0) {
             return R.fail("重复提交！");
-        }else {
+        } else {
             LambdaQueryWrapper<TJoinpayMchCheck> query = Wrappers.lambdaQuery();
-            query.eq(TJoinpayMchCheck::getType,"0");
-            query.eq(TJoinpayMchCheck::getAdminId,tJoinpayMch.getAdminId());
+            query.eq(TJoinpayMchCheck::getType, "0");
+            query.eq(TJoinpayMchCheck::getAdminId, tJoinpayMch.getAdminId());
             List<TJoinpayMchCheck> list = tJoinpayMchCheckService.list(query);
-            if(list.size()>0){
+            if (list.size() > 0) {
                 return R.fail("重复提交！");
             }
             TJoinpayMchCheck joinpayMchCheck = new TJoinpayMchCheck();
@@ -313,10 +316,10 @@ public class TJoinpayMchController {
             if (!StringUtils.isEmpty(mch.getLicenseNo())) {
                 joinpayMchCheck.setLicenseNo(mch.getLicenseNo());
             }
-            if(mch.getSettMode()!=null){
+            if (mch.getSettMode() != null) {
                 joinpayMchCheck.setSettMode(mch.getSettMode());
             }
-            if(mch.getRiskDay()!=null){
+            if (mch.getRiskDay() != null) {
                 joinpayMchCheck.setRiskDay(mch.getRiskDay());
             }
             joinpayMchCheck.setType("0");