diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/DeviceStockController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/DeviceStockController.java
index 6c9a42e..54071b1 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/DeviceStockController.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/DeviceStockController.java
@@ -1,13 +1,19 @@
 package com.chaozhanggui.admin.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chaozhanggui.admin.system.service.DeviceStockService;
 import com.chaozhanggui.common.system.config.RespBody;
+import com.chaozhanggui.dao.system.dao.TbPlussDeviceStockMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
+ *库存管理
  * @author lyf
  */
 @CrossOrigin(origins = "*")
@@ -15,7 +21,10 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/DeviceStock")
 @Slf4j
 public class DeviceStockController {
-//    @RequestMapping("pageData")
+    @Resource
+    private DeviceStockService deviceStockService;
+
+//    @GetMapping("pageData")
 //    public RespBody pageData(){
 //
 //    }
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantChannelStatusController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantChannelStatusController.java
index ce0631e..41d1332 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantChannelStatusController.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantChannelStatusController.java
@@ -139,14 +139,13 @@ public class MerchantChannelStatusController {
      */
     @GetMapping(value = "/manualMerchantIncom")
     public RespBody manualMerchantIncome(@RequestParam("userId") String userId, @RequestParam("channelId") String channelId,
-                                         @RequestParam("merchantCode") String merchantCode,@RequestParam("type")String type,
-                                         @RequestParam("errMsg")String errMsg){
+                                         @RequestParam("type")String type, @RequestParam("errMsg")String errMsg){
         if ("1".equals(type)) {
             //进件
             merchantService.merchantAudit(userId, channelId);
         }else if ("2".equals(type)){
             //驳回
-            merchantService.rejectAudit(merchantCode,errMsg);
+            merchantService.rejectAudit(userId,errMsg);
         }
 
        return new RespBody ("000000");
@@ -178,9 +177,9 @@ public class MerchantChannelStatusController {
      * 通道进件信息
      * @return
      */
-    @GetMapping("/messageChannel/{userId}/{merchantCode}")
-    public RespBody messageChannel(@PathVariable("userId") Integer userId,@PathVariable("merchantCode")String merchantCode){
-        return merchantChannelStatusService.messageChannel(userId, merchantCode);
+    @GetMapping("/messageChannel/{userId}")
+    public RespBody messageChannel(@PathVariable("userId") Integer userId){
+        return merchantChannelStatusService.messageChannel(userId);
     }
 
     /**
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java
index e9a5a56..2072ef0 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java
@@ -113,6 +113,26 @@ public class MerchantInfoController {
     public RespBody merchBaseInfo(@PathVariable("userId") Integer userId){
         return merchantInfoService.merchantBaseInfo(userId);
     }
+
+    /**
+     * 营业执照信息
+     * @param userId
+     * @return
+     */
+    @GetMapping("/detail/merchLicense/{userId}")
+    public RespBody merchLicense(@PathVariable("userId") Integer userId){
+        return merchantInfoService.merchLicense(userId);
+    }
+
+    /**
+     * 营业执照信息更改
+     * @return
+     */
+    @PostMapping("/detail/updatemerchLicense")
+    public RespBody updateMerchLicense(@RequestBody TbPlussMerchantBaseInfo merchantBaseInfo){
+        return merchantInfoService.updateMerchLicense(merchantBaseInfo);
+    }
+
     /**
      * 结算信息
      * @param userId
@@ -133,6 +153,25 @@ public class MerchantInfoController {
         return merchantInfoService.updateAccountD1(account);
     }
 
+    /**
+     * 认证信息
+     */
+    @GetMapping("/detail/authentication/{userId}")
+    public RespBody authentication(@PathVariable("userId") Integer userId){
+        return merchantInfoService.authentication(userId);
+    }
+
+    /**
+     * 更改认证信息
+     * @param merchantCode
+     * @param picUrl
+     * @return
+     */
+    @GetMapping("/detail/updateAuthentication")
+    public RespBody updateAuthentication(String merchantCode, String picUrl){
+        return merchantInfoService.updateAuthentication(merchantCode, picUrl);
+    }
+
     /**
      * 获取对应的银行
      */
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/NotificationController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/NotificationController.java
index 1795939..9531f5b 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/NotificationController.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/NotificationController.java
@@ -25,9 +25,26 @@ public class NotificationController {
     @Resource
     private NotificationService notificationService;
 
+    /**
+     *消息列表
+     * @param currPage
+     * @param size
+     * @return
+     */
     @GetMapping("/page")
     @ResponseBody
     public RespBody notificationQuery(@RequestParam("currPage") Integer currPage, @RequestParam("size")Integer size){
         return notificationService.notificationQuery(currPage,size);
     }
+
+    /**
+     * 已读未读
+     * @param noticecode
+     * @return
+     */
+    @GetMapping("/unread")
+    @ResponseBody
+    public RespBody notificationUpdate(@RequestParam("noticecode") String noticecode){
+        return notificationService.notificationUpdate(noticecode);
+    }
 }
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/DeviceStockService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/DeviceStockService.java
new file mode 100644
index 0000000..f3ead71
--- /dev/null
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/DeviceStockService.java
@@ -0,0 +1,11 @@
+package com.chaozhanggui.admin.system.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 库存管理
+ * @author lyf
+ */
+@Service
+public class DeviceStockService {
+}
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java
index 78196ad..f9aee68 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java
@@ -102,6 +102,8 @@ public class MerchantChannelStatusService {
     private TbPlussAccountMapper accountMapper;
     @Resource
     private TbPlussOperationRecordMapper operationRecordMapper;
+    @Resource
+    private TbPlussMerchantBaseInfoMapper merchantBaseInfoMapper;
 
 //    /**
 //     * 后台进件
@@ -188,7 +190,7 @@ public class MerchantChannelStatusService {
         return merchantChannelStatusMapper.getIncomingInfoAnother(merchantCode);
     }
 
-    public RespBody messageChannel(Integer userId,String merchantCode){
+    public RespBody messageChannel(Integer userId){
         //获取审核备注组
         List<TbPlussMerchantRejectDesc> merchantRejectDescs = merchantRejectDescMapper.selectRejectList();
         //通道选择
@@ -200,9 +202,12 @@ public class MerchantChannelStatusService {
         channelMap.put("reviewRemarks",merchantRejectDescs);
         channelMap.put("merchantChannels",merchantChannels);
 
+        TbPlussMerchantBaseInfo tbPlussMerchantBaseInfo = merchantBaseInfoMapper.selectByUserId(String.valueOf(userId));
+
+
         List<HashMap> merchantChannelMessage = new ArrayList<>();
         //D1(已完成)
-        List<TbPlussMerchantChannelStatus> channelD1 = merchantChannelStatusMapper.getByCodeAndChannelFlagList(merchantCode, "D1");
+        List<TbPlussMerchantChannelStatus> channelD1 = merchantChannelStatusMapper.getByCodeAndChannelFlagList(tbPlussMerchantBaseInfo.getMerchantcode(), "D1");
         if (channelD1.size()>1){
             return new RespBody("000087");
         }
@@ -218,7 +223,7 @@ public class MerchantChannelStatusService {
         }
 
         //D0(已完成)
-        List<TbPlussMerchantChannelStatus> channelD0 = merchantChannelStatusMapper.getByCodeAndChannelFlagList(merchantCode, "D0");
+        List<TbPlussMerchantChannelStatus> channelD0 = merchantChannelStatusMapper.getByCodeAndChannelFlagList(tbPlussMerchantBaseInfo.getMerchantcode(), "D0");
         if (channelD0.size()>1){
             return new RespBody("000087");
         }
@@ -234,7 +239,7 @@ public class MerchantChannelStatusService {
         }
 
         //未审核
-        List<TbPlussMerchantChannelStatus> channel = merchantChannelStatusMapper.getByCodeAndChannelFlagList(merchantCode, "1");
+        List<TbPlussMerchantChannelStatus> channel = merchantChannelStatusMapper.getByCodeAndChannelFlagList(tbPlussMerchantBaseInfo.getMerchantcode(), "1");
         if (channel.size()>1){
             return new RespBody("000087");
         }
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java
index 93891ed..bb603bb 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java
@@ -4,12 +4,14 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.chaozhanggui.common.system.config.MsgException;
 import com.chaozhanggui.common.system.config.RespBody;
 import com.chaozhanggui.dao.system.dao.*;
 import com.chaozhanggui.dao.system.entity.*;
 import com.chaozhanggui.dao.system.entity.DTO.AccountDTO;
 import com.chaozhanggui.dao.system.entity.VO.AccountVO;
+import com.chaozhanggui.dao.system.entity.VO.LicenseVO;
 import com.chaozhanggui.dao.system.entity.VO.MerchantBaseVO;
 import com.chaozhanggui.merchant.service.MerchantService;
 import org.apache.commons.lang3.StringUtils;
@@ -58,6 +60,8 @@ public class MerchantInfoService {
     private TbPlussBankCodeSxfMapper bankCodeSxfMapper;
     @Resource
     private MerchantService merchantService;
+    @Resource
+    private TbPlussSxfMccInfoMapper sxfMccInfoMapper;
 
 
 
@@ -68,10 +72,14 @@ public class MerchantInfoService {
         //银行卡
         TbPlussBankCard bankCard = bankCardMapper.selectByUserIdCert(userId, ACCOUNT_TYPE_CERT);
         TbPlussUserApp tbPlussUserApp = userAppMapper.selectByUserId(userId);
+        TbPlussUserInfo tbPlussUserInfo = userInfoMapper.selectByPrimaryKey(Long.valueOf(tbPlussUserApp.getUserid()));
+
         map.put("status",tbPlussUserApp.getStatus());
         map.put("id",tbPlussUserApp.getId());
         map.put("idCard",idCard);
         map.put("bankCard",bankCard);
+        map.put("username",tbPlussUserApp.getUsername());
+        map.put("loginname",tbPlussUserInfo.getLoginname());
         return new RespBody("000000",map);
     }
 
@@ -93,6 +101,62 @@ public class MerchantInfoService {
         return new RespBody("000000",merchantBaseVO);
     }
 
+    public RespBody merchLicense(Integer userId){
+        HashMap<String, Object> map = new HashMap<>();
+        TbPlussMerchantBaseInfo mbi = merchantBaseInfoMapper.selectByUserId(userId + "");
+        if (mbi == null || "1".equals(mbi.getMerchanttype())){
+            map.put("idCard", "");
+            map.put("license","");
+            return new RespBody(map);
+        }
+
+        TbPlussIdCard idCard = idCardMapper.getLegalIdCard(userId+ "");
+        //营业执照相关
+        TbPlussMerchantImage merchantImage = merchantImageMapper.selectByMerchantCodeType(mbi.getMerchantcode(), TbPlussMerchantImage.BUSINESS_LICENSE);
+        LicenseVO licenseVO = new LicenseVO();
+        if (merchantImage == null){
+            licenseVO.setLicenseimage("");
+        }else {
+            licenseVO.setLicenseimage(merchantImage.getPicurl());
+        }
+        //组装
+
+        licenseVO.setId(mbi.getId());
+        licenseVO.setPrincipalperson(mbi.getPrincipalperson());
+        licenseVO.setBussauthname(mbi.getBussauthname());
+        licenseVO.setBussauthnum(mbi.getBussauthnum());
+        licenseVO.setBussauthaddress(mbi.getBussauthaddress());
+        licenseVO.setBussauthstarttime(mbi.getBussauthstarttime());
+        licenseVO.setBussauthendtime(mbi.getBussauthendtime());
+        map.put("idCard", idCard);
+        map.put("license",licenseVO);
+        return new RespBody(map);
+    }
+    @Transactional(rollbackFor = Exception.class)
+    public RespBody updateMerchLicense(TbPlussMerchantBaseInfo merchantBaseInfo) {
+        if (merchantBaseInfo == null || merchantBaseInfo.getIdCard() == null){
+            return new RespBody("000089");
+        }
+        //组装
+        merchantBaseInfo.setId(merchantBaseInfo.getLicense().getId());
+        merchantBaseInfo.setPrincipalperson(merchantBaseInfo.getLicense().getPrincipalperson());
+        merchantBaseInfo.setBussauthname(merchantBaseInfo.getLicense().getBussauthname());
+        merchantBaseInfo.setBussauthnum(merchantBaseInfo.getLicense().getBussauthnum());
+        merchantBaseInfo.setBussauthaddress(merchantBaseInfo.getLicense().getBussauthaddress());
+        merchantBaseInfo.setBussauthstarttime(merchantBaseInfo.getLicense().getBussauthstarttime());
+        merchantBaseInfo.setBussauthendtime(merchantBaseInfo.getLicense().getBussauthendtime());
+        merchantBaseInfoMapper.updateByPrimaryKeySelective(merchantBaseInfo);
+        idCardMapper.updateByPrimaryKeySelective(merchantBaseInfo.getIdCard());
+        //营业执照更改
+        TbPlussMerchantBaseInfo merchantBase = merchantBaseInfoMapper.selectByPrimaryKey(merchantBaseInfo.getLicense().getId());
+        TbPlussMerchantImage merchantImage = new TbPlussMerchantImage();
+        merchantImage.setPhotourl(merchantBaseInfo.getLicense().getLicenseimage());
+        merchantImage.setMerchantcode(merchantBase.getMerchantcode());
+        merchantImage.setPhotoType("03");
+        merchantImageMapper.updateByCodeAndType(merchantImage);
+        return new RespBody("000000");
+    }
+
     public RespBody merchantAccount(Integer userId){
         HashMap<String, Object> realAccount = getRealAccount(userId);
         return new RespBody("000000",realAccount);
@@ -130,10 +194,28 @@ public class MerchantInfoService {
             AccountVO accountVO = new AccountVO();
             // 获取身份证信息
             TbPlussIdCard idCard = idCardMapper.selectByPrimaryKey(Integer.valueOf(accountD1.getIdcardid()));
-            accountVO.setIdCard(idCard);
+            if (idCard == null){
+                accountVO.setIdCard(new TbPlussIdCard());
+            }else {
+                accountVO.setIdCard(idCard);
+            }
             // 获取银行卡信息
             TbPlussBankCard bankCard = bankCardMapper.selectByPrimaryKey(Integer.valueOf(accountD1.getBankcardid()));
-            accountVO.setBankCard(bankCard);
+            if (bankCard == null){
+                accountVO.setBankCard(new TbPlussBankCard());
+            }else {
+                accountVO.setBankCard(bankCard);
+            }
+
+            //判断结算类型
+            switch (accountD1.getSettletype()){
+                case "02":
+                    accountVO.setCertificateurl(accountD1.getCertificateurl());
+                    break;
+                case "03":
+                    accountVO.setPublicimage(bankCard.getLicenseurl());
+                    break;
+            }
             map.put("D1",accountVO);
         }
         //D0
@@ -144,10 +226,27 @@ public class MerchantInfoService {
             AccountVO accountVO = new AccountVO();
             // 获取身份证信息
             TbPlussIdCard idCard = idCardMapper.selectByPrimaryKey(Integer.valueOf(accountD0.getIdcardid()));
-            accountVO.setIdCard(idCard);
+            if (idCard == null){
+                accountVO.setIdCard(new TbPlussIdCard());
+            }else {
+                accountVO.setIdCard(idCard);
+            }
             // 获取银行卡信息
             TbPlussBankCard bankCard = bankCardMapper.selectByPrimaryKey(Integer.valueOf(accountD0.getBankcardid()));
-            accountVO.setBankCard(bankCard);
+            if (bankCard == null){
+                accountVO.setBankCard(new TbPlussBankCard());
+            }else {
+                accountVO.setBankCard(bankCard);
+            }
+            //判断结算类型
+            switch (accountD0.getSettletype()){
+                case "02":
+                    accountVO.setCertificateurl(accountD0.getCertificateurl());
+                    break;
+                case "03":
+                    accountVO.setPublicimage(bankCard.getLicenseurl());
+                    break;
+            }
             map.put("D0",accountVO);
         }
         return map;
@@ -158,7 +257,7 @@ public class MerchantInfoService {
             //保存实名认证的其他信息
             UpdateWrapper<TbPlussBankCard> bankCardUpdateWrapper = new UpdateWrapper<TbPlussBankCard>().eq("userId", userApp.getUserid());
             //判断实名人与结算人是否为同一人
-            AccountDTO accountDTO = accountService.getRealAccount(userApp.getBankCard().getUserid());
+            AccountDTO accountDTO = accountService.getRealAccount(String.valueOf(userApp.getUserid()));
             if (accountDTO == null || accountDTO.getIdcard() == null || !userApp.getIdCard().getCertno().equals(accountDTO.getIdcard().getCertno())) {
                 bankCardUpdateWrapper.eq("accountType", TbPlussBankCard.ACCOUNT_TYPE_CERT);
             }
@@ -186,8 +285,9 @@ public class MerchantInfoService {
                 return new RespBody("000072");
             }
             userApp.getBankCard().setContactline(bankCodeSxf.getCnapsCode());
+            userApp.getBankCard().setBranchname(bankCodeSxf.getCnapsName());
             bankCardMapper.updateByPrimaryKeySelective(userApp.getBankCard());
-            UpdateWrapper<TbPlussIdCard> idCardUpdateWrapper = new UpdateWrapper<TbPlussIdCard>().eq("userId", userApp.getUserid()).eq("userType", TbPlussIdCard.TYPE_CERT);
+           // UpdateWrapper<TbPlussIdCard> idCardUpdateWrapper = new UpdateWrapper<TbPlussIdCard>().eq("userId", userApp.getUserid()).eq("userType", TbPlussIdCard.TYPE_CERT);
             if ("".equals(userApp.getIdCard().getImgpositive())) {
                 userApp.getIdCard().setImgpositive(null);
             }
@@ -247,10 +347,12 @@ public class MerchantInfoService {
                     merchantBaseInfo.setDistrict(areaCity.getAreaname());
                 }
             }
-//            UpdateWrapper<TbPlussMerchantBaseInfo> merchantBaseInfoUpdateWrapper = new UpdateWrapper<TbPlussMerchantBaseInfo>()
-//                    .eq("userId", userApp.getUserid());
-//            merchantChannelMapper.update(userApp.getMerchantBaseInfo(), merchantBaseInfoUpdateWrapper);
-
+            //查找mcc码
+            List<TbPlussSxfMccInfo> sxfMccInfos = sxfMccInfoMapper.selectList(merchantBaseInfo.getMcc());
+            if (sxfMccInfos == null){
+                return new RespBody("000088");
+            }
+            merchantBaseInfo.setMccname(sxfMccInfos.get(0).getfMccTxt());
             merchantBaseInfoMapper.updateByPrimaryKeySelective(merchantBaseInfo);
         }
         if (merchantBaseInfo.getMerchantcode() != null) {
@@ -301,12 +403,36 @@ public class MerchantInfoService {
         if (tbPlussAccount == null){
             return new RespBody("000051");
         }
+        //自己数据
         bankCardMapper.updateByPrimaryKeySelective(account.getBankCard());
         idCardMapper.updateByPrimaryKeySelective(account.getIdcard());
         //三方
         merchantService.updateMerchantBase(Integer.valueOf(account.getUserid()),account.getBankCard(),account.getIdcard());
         return new RespBody("000000");
+    }
 
+    public RespBody authentication(Integer userId){
+        TbPlussMerchantBaseInfo merchantBaseInfo = merchantBaseInfoMapper.selectByUserId(String.valueOf(userId));
+        if (merchantBaseInfo == null){
+            return new RespBody("000090");
+        }
+        TbPlussMerchantImage merchantImage = merchantImageMapper.selectByMerchantCodeType(merchantBaseInfo.getMerchantcode(), "999");
+        HashMap<String, String> map = new HashMap<>();
+        map.put("image",merchantImage.getPicurl());
+        return new RespBody(map);
+    }
+
+    public RespBody updateAuthentication(String merchantCode,String picUrl){
+        if (merchantCode == null || picUrl == null){
+            return new RespBody("000090");
+        }
+        TbPlussMerchantImage merchantImage = merchantImageMapper.selectByMerchantCodeType(merchantCode, "999");
+        if (merchantImage == null){
+            return new RespBody("000090");
+        }
+        merchantImage.setPicurl(picUrl);
+        merchantImageMapper.updateByPrimaryKeySelective(merchantImage);
+        return new RespBody("000000");
     }
 
 
diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/NotificationService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/NotificationService.java
index f746b76..d5a3684 100644
--- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/NotificationService.java
+++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/NotificationService.java
@@ -33,4 +33,16 @@ public class NotificationService {
         map.put("list",pageInfo);
         return new RespBody(map);
     }
+
+    public RespBody notificationUpdate(String noticecode){
+        TbPlussNotice notice = tbPlussNoticeMapper.selectByNoticeCode(noticecode);
+        if (notice == null){
+            return new RespBody("000091");
+        }
+        TbPlussNotice tbPlussNotice = new TbPlussNotice();
+        tbPlussNotice.setNoticecode(noticecode);
+        tbPlussNotice.setIsdeal(1);
+        tbPlussNoticeMapper.updateByNoticeCode(tbPlussNotice);
+        return new RespBody("000000");
+    }
 }
diff --git a/newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/ExceptionUtil.java b/newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/ExceptionUtil.java
index a77bc1c..fbce0d6 100644
--- a/newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/ExceptionUtil.java
+++ b/newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/ExceptionUtil.java
@@ -86,6 +86,10 @@ public class ExceptionUtil {
          map.put("000085","当前通道下已进件，请选择别的进件通道");
          map.put("000086","不是目标用户");
          map.put("000087","数据有误");
+         map.put("000088","mcc码有误");
+         map.put("000089","缺失数据");
+         map.put("000090","用户异常");
+         map.put("000091","消息异常");
 
 
 
diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussNoticeMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussNoticeMapper.java
index 15aba85..40f3785 100644
--- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussNoticeMapper.java
+++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussNoticeMapper.java
@@ -4,6 +4,7 @@ import com.chaozhanggui.dao.system.entity.TbPlussNotice;
 
 import com.chaozhanggui.dao.system.entity.TbPlussNotification;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -19,12 +20,16 @@ public interface TbPlussNoticeMapper {
 
     TbPlussNotice selectByPrimaryKey(Integer id);
 
+    TbPlussNotice selectByNoticeCode(@Param("noticecode") String noticecode);
+
     int updateByPrimaryKeySelective(TbPlussNotice record);
 
     int updateByPrimaryKeyWithBLOBs(TbPlussNotice record);
 
     int updateByPrimaryKey(TbPlussNotice record);
 
+    int updateByNoticeCode(TbPlussNotice record);
+
     Integer unreadMessage();
 
     List<TbPlussNotice> queryNotification();
diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussMerchantBaseInfo.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussMerchantBaseInfo.java
index 5c8c9e1..a211bd4 100644
--- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussMerchantBaseInfo.java
+++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussMerchantBaseInfo.java
@@ -1,6 +1,7 @@
 package com.chaozhanggui.dao.system.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.chaozhanggui.dao.system.entity.VO.LicenseVO;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -117,6 +118,13 @@ public class TbPlussMerchantBaseInfo implements Serializable {
     private String cityCode;
 
     private String districtCode;
+    /**
+     *身份证号
+     */
+    @TableField(exist = false)
+    private TbPlussIdCard idCard;
+
+    private LicenseVO license;
 
 
     private Date firsttradetime;
@@ -127,6 +135,14 @@ public class TbPlussMerchantBaseInfo implements Serializable {
 
     private Byte validflag;
 
+    public LicenseVO getLicense() {
+        return license;
+    }
+
+    public void setLicense(LicenseVO license) {
+        this.license = license;
+    }
+
     public String getProvinceCode() {
         return provinceCode;
     }
@@ -151,6 +167,14 @@ public class TbPlussMerchantBaseInfo implements Serializable {
         this.districtCode = districtCode;
     }
 
+    public TbPlussIdCard getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(TbPlussIdCard idCard) {
+        this.idCard = idCard;
+    }
+
     @TableField(exist = false)
     private String picUrl1;
     @TableField(exist = false)
diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/AccountVO.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/AccountVO.java
index 909bc6e..371d066 100644
--- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/AccountVO.java
+++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/AccountVO.java
@@ -19,4 +19,12 @@ public class AccountVO {
      * 结算人身份信息
      */
     private TbPlussIdCard idCard;
+    /**
+     * 非法人授权函
+     */
+    private String certificateurl;
+    /**
+     * 对公
+     */
+    private String publicimage;
 }
diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/LicenseVO.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/LicenseVO.java
new file mode 100644
index 0000000..3702764
--- /dev/null
+++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/LicenseVO.java
@@ -0,0 +1,87 @@
+package com.chaozhanggui.dao.system.entity.VO;
+
+/**
+ * 营业执照
+ * @author lyf
+ */
+public class LicenseVO {
+    private Integer id;
+
+    private String principalperson;
+
+    private String bussauthname;
+
+    private String bussauthnum;
+
+    private String bussauthaddress;
+
+    private String bussauthstarttime;
+
+    private String bussauthendtime;
+
+    private String licenseimage;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPrincipalperson() {
+        return principalperson;
+    }
+
+    public void setPrincipalperson(String principalperson) {
+        this.principalperson = principalperson;
+    }
+
+    public String getBussauthname() {
+        return bussauthname;
+    }
+
+    public void setBussauthname(String bussauthname) {
+        this.bussauthname = bussauthname;
+    }
+
+    public String getBussauthnum() {
+        return bussauthnum;
+    }
+
+    public void setBussauthnum(String bussauthnum) {
+        this.bussauthnum = bussauthnum;
+    }
+
+    public String getBussauthaddress() {
+        return bussauthaddress;
+    }
+
+    public void setBussauthaddress(String bussauthaddress) {
+        this.bussauthaddress = bussauthaddress;
+    }
+
+    public String getBussauthstarttime() {
+        return bussauthstarttime;
+    }
+
+    public void setBussauthstarttime(String bussauthstarttime) {
+        this.bussauthstarttime = bussauthstarttime;
+    }
+
+    public String getBussauthendtime() {
+        return bussauthendtime;
+    }
+
+    public void setBussauthendtime(String bussauthendtime) {
+        this.bussauthendtime = bussauthendtime;
+    }
+
+    public String getLicenseimage() {
+        return licenseimage;
+    }
+
+    public void setLicenseimage(String licenseimage) {
+        this.licenseimage = licenseimage;
+    }
+}
diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussBankCodeSxfMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussBankCodeSxfMapper.xml
index 961e347..5b823da 100644
--- a/newadmin/dao-api/src/main/resources/mapper/TbPlussBankCodeSxfMapper.xml
+++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussBankCodeSxfMapper.xml
@@ -29,9 +29,9 @@
       <where>
         F_mcc_type != '线上'
       <if test="keyWord != null and keyWord != ''">
-        AND F_grandpa_txt LIKE #{keyWord}
-        OR F_mcc_txt LIKE #{keyWord}
-        OR F_father_txt LIKE #{keyWord}
+        AND F_grandpa_txt LIKE CONCAT(#{keyWord}, "%")
+        OR F_mcc_txt LIKE CONCAT(#{keyWord}, "%")
+        OR F_father_txt LIKE CONCAT(#{keyWord}, "%")
       </if>
       </where>
     </select>
diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml
index 6e55840..e3087eb 100644
--- a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml
+++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml
@@ -428,6 +428,9 @@
       <if test="mcc != null">
         mcc = #{mcc,jdbcType=VARCHAR},
       </if>
+      <if test="mccname != null">
+        mccName=#{mccname,jdbcType=VARCHAR},
+      </if>
       <if test="alias != null">
         alias = #{alias,jdbcType=VARCHAR},
       </if>
diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussNoticeMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussNoticeMapper.xml
index 3ac41fb..81aafb1 100644
--- a/newadmin/dao-api/src/main/resources/mapper/TbPlussNoticeMapper.xml
+++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussNoticeMapper.xml
@@ -51,8 +51,12 @@
       typeFirst = 1
       AND isDeal = 0
   </select>
+  <select id="selectByNoticeCode" resultType="com.chaozhanggui.dao.system.entity.TbPlussNotice">
+    select * from tb_pluss_notice
+    where noticeCode = #{noticecode}
+  </select>
 
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from tb_pluss_notice
     where id = #{id,jdbcType=INTEGER}
   </delete>
@@ -250,4 +254,49 @@
       uniqueKey = #{uniquekey,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <update id="updateByNoticeCode" parameterType="com.chaozhanggui.dao.system.entity.TbPlussNotice">
+    update tb_pluss_notice
+    <set>
+      <if test="userid != null">
+        userId = #{userid,jdbcType=VARCHAR},
+      </if>
+      <if test="username != null">
+        userName = #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="typefirst != null">
+        typeFirst = #{typefirst,jdbcType=INTEGER},
+      </if>
+      <if test="typesecond != null">
+        typeSecond = #{typesecond,jdbcType=INTEGER},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="desc != null">
+        desc = #{desc,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null">
+        url = #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="createdt != null">
+        createDt = #{createdt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ordernumber != null">
+        orderNumber = #{ordernumber,jdbcType=VARCHAR},
+      </if>
+      <if test="isdeal != null">
+        isDeal = #{isdeal,jdbcType=INTEGER},
+      </if>
+      <if test="isapply != null">
+        isApply = #{isapply,jdbcType=INTEGER},
+      </if>
+      <if test="uniquekey != null">
+        uniqueKey = #{uniquekey,jdbcType=VARCHAR},
+      </if>
+      <if test="conrtent != null">
+        conrtent = #{conrtent,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where noticeCode = #{noticecode,jdbcType=VARCHAR}
+  </update>
 </mapper>
\ No newline at end of file
diff --git a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java
index 5acbc64..8058fd1 100644
--- a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java
+++ b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/MerchantService.java
@@ -114,7 +114,7 @@ public class MerchantService {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void rejectAudit(String merchantCode, String errMsg){
+    public void rejectAudit(String userId, String errMsg){
         MsgException.checkBlank(errMsg, "请补充驳回原因");
 
         List<Integer> validChannelIdList = tbPlussMerchantChannelMapper.getValidChannelIdList();
@@ -128,8 +128,9 @@ public class MerchantService {
 //                .eq(MerchantChannelStatus::getThirdStatus, "-100");
 //
 //        MerchantChannelStatus merchantChannelStatus = getOne(qWrapper);
+        TbPlussMerchantBaseInfo merchantBaseInfo = tbPlussMerchantBaseInfoMapper.selectByUserId(userId);
 
-        TbPlussMerchantChannelStatus merchantChannelStatus = tbPlussMerchantChannelStatusMapper.reject(merchantCode, validChannelIdList);
+        TbPlussMerchantChannelStatus merchantChannelStatus = tbPlussMerchantChannelStatusMapper.reject(merchantBaseInfo.getMerchantcode(), validChannelIdList);
 
         TbPlussMerchantChannelStatus.checkCanAudit(merchantChannelStatus);
 
@@ -146,7 +147,7 @@ public class MerchantService {
         merchant.setThirdstatus("");
         tbPlussMerchantChannelStatusMapper.updateByPrimaryKeySelective(merchant);
 
-        TbPlussUserApp userApp = tbPlussUserAppMapper.selectByMerchantCode(merchantCode);
+        TbPlussUserApp userApp = tbPlussUserAppMapper.selectByMerchantCode(merchantBaseInfo.getMerchantcode());
 
 
         TbPlussNotice notice = new TbPlussNotice(1, 1, userApp);