浏览代码

fix:“添加第三方调用密钥字段“

soobin 1 年之前
父节点
当前提交
b966ad1a2c

+ 0 - 32
src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -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();

文件差异内容过多而无法显示
+ 2 - 1
src/main/java/com/szwl/mapper/xml/TAdminMapper.xml


+ 3 - 0
src/main/java/com/szwl/model/entity/TAdmin.java

@@ -159,5 +159,8 @@ public class TAdmin implements Serializable {
     @ApiModelProperty(value = "微信公众号订单通知,0:关闭,1:开启,默认关闭")
     @ApiModelProperty(value = "微信公众号订单通知,0:关闭,1:开启,默认关闭")
     private String orderNotice;
     private String orderNotice;
 
 
+    @ApiModelProperty(value = "第三方调用API密钥")
+    private String apiKey;
+
 
 
 }
 }