diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockMapper.java
index a70aef2..9a9931d 100644
--- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockMapper.java
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockMapper.java
@@ -63,7 +63,7 @@ public interface DeviceStockMapper extends BaseMapper<DeviceStock> {
     DeviceStock getDeviceBySnNo(String snNo);
 
 
-    Page<DeviceStockVO> pageDeviceStock(Page<DeviceStockVO> page, @Param("userId") Long userId, @Param("cashPlaceId") Long cashPlaceId);
+    Page<DeviceStockVO> pageDeviceStock(Page<DeviceStockVO> page,@Param("cashPlaceId") Long cashPlaceId);
 
     @Select("SELECT * FROM tb_pluss_device_stock where deviceNo = #{deviceNo} limit 1")
     DeviceStock getDeviceByDeviceNo(@Param("deviceNo") String deviceNo);
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceStockMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceStockMapper.xml
index 2974af8..0bc047f 100644
--- a/pluss-dao-bundle/src/main/resources/mapper/DeviceStockMapper.xml
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceStockMapper.xml
@@ -205,20 +205,20 @@
     <select id="pageDeviceStock" resultType="cn.pluss.platform.vo.DeviceStockVO">
         SELECT ds.*, dt.`name` deviceName, spec.specName typeDesc, dg.deviceLogo, dt.payCodeFlag, mcp.name cashPlaceName
         FROM tb_pluss_device_stock ds
-        LEFT JOIN tb_pluss_merchant_base_info mbi ON ds.actMercId = mbi.id
-        LEFT JOIN tb_pluss_device_type dt ON dt.`code` = ds.`code`
-        LEFT JOIN tb_pluss_device_spec spec ON ds.`code` = spec.`code` AND ds.type = spec.spec
-        LEFT JOIN tb_pluss_merchant_cash_pay_code mcpc ON mcpc.payCode = ds.snNo
-        LEFT JOIN tb_pluss_merchant_cash_place mcp ON mcpc.cashPlaceId = mcp.id
-        LEFT JOIN tb_pluss_device_goods dg ON dg.`code` = ds.`code`
-        <where>
-            <if test="userId != null">
-                AND mbi.userId = #{userId}
-            </if>
-            <if test="cashPlaceId != null">
-                AND mcpc.cashPlaceId = #{cashPlaceId}
-            </if>
-        </where>
+        left JOIN tb_pluss_device_type dt ON dt.`code` = ds.`code`
+        left JOIN tb_pluss_device_spec spec ON ds.`code` = spec.`code` AND ds.type = spec.spec
+        left JOIN tb_pluss_merchant_cash_pay_code mcpc ON mcpc.payCode = ds.snNo
+        left JOIN tb_pluss_merchant_cash_place mcp ON mcp.id = mcpc.cashPlaceId
+        left JOIN tb_pluss_device_goods dg ON dg.`code` = ds.`code`
+        where mcpc.cashPlaceId = #{cashPlaceId}
+<!--         <where>-->
+<!--            <if test="userId != null">-->
+<!--                AND mbi.userId = #{userId}-->
+<!--            </if>-->
+<!--            <if test="cashPlaceId != null">-->
+<!--                AND mcpc.cashPlaceId = #{cashPlaceId}-->
+<!--            </if>-->
+<!--        </where>-->
     </select>
 
 </mapper>
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
index 693270b..2acb828 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
@@ -349,29 +349,32 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
             List<MerchantBaseInfo> list = merchantBaseInfoMapper.selectList(baseInfoQueryWrapper);
             if (list.size() > 0) {
                 MerchantBaseInfo merchantBaseInfo = list.iterator().next();
-                MerchantCashPlace merchantCashPlace = new MerchantCashPlace();
-                merchantCashPlace.setAddress(merchantBaseInfo.getAddress());
-                merchantCashPlace.setUserId(Long.valueOf(merchantBaseInfo.getUserId()));
-                merchantCashPlace.setName("收银点一");
-                merchantCashPlace.setPayPassageId(channl);
-                MerchantChannel merchantChannel = merchantChannelMapper.selectById(channl);
-                if (Objects.nonNull(merchantChannel)){
-                    merchantCashPlace.setPayPassageName(merchantChannel.getChannelName());
-                }
-                merchantCashPlace.setCreateTime(new Date());
-                merchantCashPlace.setName(merchantBaseInfo.getAlias());
-                merchantCashPlace.setRootAccountId(merchantCashPlace.getUserId());
-                merchantCashPlace.setCode(getCode());
-                merchantCashPlaceMapper.insert(merchantCashPlace);
                 UserInfo userInfo = userInfoMapper.selectById(merchantBaseInfo.getUserId());
-                UserCashPlace childUserCashPlace = new UserCashPlace();
-                childUserCashPlace.setChasplaceId(merchantCashPlace.getId());
-                childUserCashPlace.setCreateTime(new Date());
-                childUserCashPlace.setIsRootAccount("true");
-                childUserCashPlace.setOrgCode(userInfo.getLoginName());
-                childUserCashPlace.setRootAccountId(userInfo.getId().intValue());
-                childUserCashPlace.setUserId(userInfo.getId());
-                userCashPlaceMapper.insert(childUserCashPlace);
+                if (Objects.nonNull(userInfo) &&!userInfo.getLoginName().contains("-")){
+                    MerchantCashPlace merchantCashPlace = new MerchantCashPlace();
+                    merchantCashPlace.setAddress(merchantBaseInfo.getAddress());
+                    merchantCashPlace.setUserId(Long.valueOf(merchantBaseInfo.getUserId()));
+                    merchantCashPlace.setName("收银点一");
+                    merchantCashPlace.setPayPassageId(channl);
+                    MerchantChannel merchantChannel = merchantChannelMapper.selectById(channl);
+                    if (Objects.nonNull(merchantChannel)){
+                        merchantCashPlace.setPayPassageName(merchantChannel.getChannelName());
+                    }
+                    merchantCashPlace.setPayPassageId(mcs.getChannel());
+                    merchantCashPlace.setPayPassageName(mcs.getChannelName());
+                    merchantCashPlace.setCreateTime(new Date());
+                    merchantCashPlace.setRootAccountId(Long.valueOf(merchantBaseInfo.getUserId()));
+                    merchantCashPlace.setCode(getCode());
+                    merchantCashPlaceMapper.insert(merchantCashPlace);
+                    UserCashPlace childUserCashPlace = new UserCashPlace();
+                    childUserCashPlace.setChasplaceId(merchantCashPlace.getId());
+                    childUserCashPlace.setCreateTime(new Date());
+                    childUserCashPlace.setIsRootAccount("true");
+                    childUserCashPlace.setOrgCode(userInfo.getLoginName());
+                    childUserCashPlace.setRootAccountId(userInfo.getId().intValue());
+                    childUserCashPlace.setUserId(userInfo.getId());
+                    userCashPlaceMapper.insert(childUserCashPlace);
+                }
             }
         }
     }
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java
index 0919a2d..11a9c20 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java
@@ -351,7 +351,7 @@ public class DeviceStockServiceImpl extends ServiceImpl<DeviceStockMapper, Devic
 
     @Override
     public Page<DeviceStockVO> pageMercDevice(Page<DeviceStockVO> page, Long userId, Long cashPlaceId) {
-        return baseMapper.pageDeviceStock(page, userId, cashPlaceId);
+        return baseMapper.pageDeviceStock(page, cashPlaceId);
     }
 
     @Override
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
index 35e0402..77b6287 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
@@ -420,42 +420,45 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void bindPayCode(MerchantCashPayCode merchantCashPayCode) {
+        if (Objects.isNull(merchantCashPayCode.getCashPlaceId()) || merchantCashPayCode.getCashPlaceId() < 1){
+            throw new MsgException("请选择收银点");
+        }
         // 参数校验
         UserApp userApp = userAppService.queryUserAppByToken();
-        List<MerchantBaseInfo> merchList = merchantBaseInfoService.getAllByUserId(userApp.getUserId() + "");
+//        List<MerchantBaseInfo> merchList = merchantBaseInfoService.getAllByUserId(userApp.getUserId() + "");
 
         MerchantCashPayCode existData = new MerchantCashPayCode().setPayCode(merchantCashPayCode.getPayCode());
         existData = cashPayCodeService.getOne(new QueryWrapper<>(existData));
         if (existData != null) {
             throw new MsgException("该收款码已绑定收银点");
         }
-
         Integer cashPlaceId = merchantCashPayCode.getCashPlaceId();
-        if (cashPlaceId == null) {
-            throw new MsgException("缺少收银点id");
-        }
+//        if (cashPlaceId == null) {
+//            throw new MsgException("缺少收银点id");
+//        }
 
-        MerchantCashPlace merchantCashPlace = new MerchantCashPlace().setId(cashPlaceId);
-        merchantCashPlace = getOne(new QueryWrapper<>(merchantCashPlace));
+        MerchantCashPlace merchantCashPlace = merchantCashPlaceMapper.selectById(cashPlaceId);
+//        MerchantCashPlace merchantCashPlace = new MerchantCashPlace().setId(cashPlaceId);
+//        merchantCashPlace = getOne(new QueryWrapper<>(merchantCashPlace));
 
-        if (merchantCashPlace == null) {
+        if (Objects.isNull(merchantCashPlace)) {
             throw new MsgException("收银点不存在");
         }
 
-        MerchantBaseInfo cashPlaceBaseInfo = new MerchantBaseInfo().setUserId(merchantCashPlace.getUserId() + "");
-        cashPlaceBaseInfo = merchantBaseInfoService.getOne(new QueryWrapper<>(cashPlaceBaseInfo));
-
-        boolean flag = true;
-        for (MerchantBaseInfo merchantBaseInfo : merchList) {
-            if (merchantBaseInfo.getUserId().equals(merchantCashPlace.getUserId() + "")) {
-                flag = false;
-                break;
-            }
-        }
-
-        if (flag) {
-            throw new MsgException("拒绝访问");
-        }
+//        MerchantBaseInfo cashPlaceBaseInfo = new MerchantBaseInfo().setUserId(merchantCashPlace.getUserId() + "");
+//        cashPlaceBaseInfo = merchantBaseInfoService.getOne(new QueryWrapper<>(cashPlaceBaseInfo));
+//
+//        boolean flag = true;
+//        for (MerchantBaseInfo merchantBaseInfo : merchList) {
+//            if (merchantBaseInfo.getUserId().equals(merchantCashPlace.getUserId() + "")) {
+//                flag = false;
+//                break;
+//            }
+//        }
+//
+//        if (flag) {
+//            throw new MsgException("拒绝访问");
+//        }
 
         if (merchantCashPayCode.getPayCode().equals(userApp.getUserId() + "")) {
             // 绑定默认的付款码，非码牌
@@ -470,14 +473,14 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
             throw new MsgException("不存在的码牌");
         }
 
-        String actMercId = deviceStock.getActMercId();
+//        String actMercId = deviceStock.getActMercId();
         if (!"3".equals(deviceStock.getStatus())) {
             deviceStockService.bindPayCode(merchantCashPayCode.getPayCode());
         }
 
-        if (StringUtils.isNotEmpty(actMercId) && !(cashPlaceBaseInfo.getId() + "").equals(actMercId)) {
-            throw new MsgException("收银点和收款码牌的所属商户不一致");
-        }
+//        if (StringUtils.isNotEmpty(actMercId) && !(cashPlaceBaseInfo.getId() + "").equals(actMercId)) {
+//            throw new MsgException("收银点和收款码牌的所属商户不一致");
+//        }
 
         // 绑定
         cashPayCodeService.bindPayCode(merchantCashPayCode);
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashierCounteServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashierCounteServiceImpl.java
index 28175c5..87f990d 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashierCounteServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashierCounteServiceImpl.java
@@ -110,11 +110,11 @@ public class MerchantCashierCounteServiceImpl implements MerchantCashierCounteSe
         wrapper.eq("root_account_id", merchantCashPlace.getUserId());
         wrapper.eq("is_root_account", "true");
         List<UserCashPlace> list = userCashPlaceMapper.selectList(wrapper);
-        int rootAccountId = userApp1.getUserId().intValue();
+        int rootAccountId = userInfo1.getId().intValue();
         String orgCode = userInfo1.getPhone();
         if (list.size() > 0) {
             UserCashPlace userCashPlace = list.iterator().next();
-            rootAccountId = userCashPlace.getRootAccountId();
+//            rootAccountId = userInfo1.getId().intValue();
             UserInfo userInfo = userInfoMapper.selectById(userCashPlace.getRootAccountId());
             orgCode = userInfo.getLoginName();
             QueryWrapper<MerchantCashPlace> queryWrapper = new QueryWrapper<>();
@@ -130,7 +130,8 @@ public class MerchantCashierCounteServiceImpl implements MerchantCashierCounteSe
         long sydNum = merchantCashPlaceMapper.selectCount(queryWrapper);
         long infoId = merchantCashPlace.getUserId();
         long userId = merchantCashPlace.getUserId();
-        String isRoot = "true";
+//        boolean isRoot = true;
+        String loginName = "";
         if (sydNum > 0) {
             UserInfo userInfo = userInfoMapper.selectById(merchantCashPlace.getUserId());
             QueryWrapper<UserCashPlace> userCashPlaceQueryWrapper = new QueryWrapper<>();
@@ -138,6 +139,8 @@ public class MerchantCashierCounteServiceImpl implements MerchantCashierCounteSe
             long sumNum = userCashPlaceMapper.selectCount(userCashPlaceQueryWrapper);
             userInfo.setId(null);
             userInfo.setLoginName(userInfo.getLoginName().concat("-").concat(String.format("%02d", sumNum + 1)));
+            loginName = userInfo.getLoginName();
+//            isRoot = false;
             userInfo.setCreateTime(new Date());
             userInfo.setPassword(MD5Util.MD5Encode("czg12345678", "utf-8"));
             Long roleId = null;
@@ -206,7 +209,7 @@ public class MerchantCashierCounteServiceImpl implements MerchantCashierCounteSe
             //TODO 同步用户到新版积分商城
             jfShopHandler.syncJfShopUser(userApp, userInfo);
             infoId = userInfo.getId();
-            isRoot = "false";
+
             QueryWrapper<IdCard> cardQueryWrapper = new QueryWrapper<>();
             cardQueryWrapper.eq("userId", userApp1.getUserId());
             List<IdCard> idCardList = idCardMapper.selectList(cardQueryWrapper);
@@ -235,7 +238,7 @@ public class MerchantCashierCounteServiceImpl implements MerchantCashierCounteSe
         merchantCashPlace.setCreateTime(new Date());
         merchantCashPlace.setCode(getCode());
         merchantCashPlaceMapper.insert(merchantCashPlace);
-        if ("true".equals(isRoot)) {
+        if (!loginName.contains("-")) {
             QueryWrapper<UserCashPlace> placeQueryWrapper = new QueryWrapper<>();
             placeQueryWrapper.eq("is_root_account", "true");
             placeQueryWrapper.eq("user_id", userApp1.getUserId());
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java
index ad9e793..d156e79 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/LklMerAuditHandler.java
@@ -171,29 +171,32 @@ public class LklMerAuditHandler {
             List<MerchantBaseInfo> list = merchantBaseInfoMapper.selectList(baseInfoQueryWrapper);
             if (list.size() > 0) {
                 MerchantBaseInfo merchantBaseInfo = list.iterator().next();
-                MerchantCashPlace merchantCashPlace = new MerchantCashPlace();
-                merchantCashPlace.setAddress(merchantBaseInfo.getAddress());
-                merchantCashPlace.setUserId(Long.valueOf(merchantBaseInfo.getUserId()));
-                merchantCashPlace.setName("收银点一");
-                merchantCashPlace.setPayPassageId(channl);
-                MerchantChannel merchantChannel = merchantChannelMapper.selectById(channl);
-                if (Objects.nonNull(merchantChannel)){
-                    merchantCashPlace.setPayPassageName(merchantChannel.getChannelName());
-                }
-                merchantCashPlace.setCreateTime(new Date());
-                merchantCashPlace.setName(merchantBaseInfo.getAlias());
-                merchantCashPlace.setRootAccountId(Long.valueOf(merchantBaseInfo.getUserId()));
-                merchantCashPlace.setCode(getCode());
-                merchantCashPlaceMapper.insert(merchantCashPlace);
                 UserInfo userInfo = userInfoMapper.selectById(merchantBaseInfo.getUserId());
-                UserCashPlace childUserCashPlace = new UserCashPlace();
-                childUserCashPlace.setChasplaceId(merchantCashPlace.getId());
-                childUserCashPlace.setCreateTime(new Date());
-                childUserCashPlace.setIsRootAccount("true");
-                childUserCashPlace.setOrgCode(userInfo.getLoginName());
-                childUserCashPlace.setRootAccountId(userInfo.getId().intValue());
-                childUserCashPlace.setUserId(userInfo.getId());
-                userCashPlaceMapper.insert(childUserCashPlace);
+                if (Objects.nonNull(userInfo) &&!userInfo.getLoginName().contains("-")){
+                    MerchantCashPlace merchantCashPlace = new MerchantCashPlace();
+                    merchantCashPlace.setAddress(merchantBaseInfo.getAddress());
+                    merchantCashPlace.setUserId(Long.valueOf(merchantBaseInfo.getUserId()));
+                    merchantCashPlace.setName("收银点一");
+                    merchantCashPlace.setPayPassageId(channl);
+                    MerchantChannel merchantChannel = merchantChannelMapper.selectById(channl);
+                    if (Objects.nonNull(merchantChannel)){
+                        merchantCashPlace.setPayPassageName(merchantChannel.getChannelName());
+                    }
+                    merchantCashPlace.setPayPassageId(mcs.getChannel());
+                    merchantCashPlace.setPayPassageName(mcs.getChannelName());
+                    merchantCashPlace.setCreateTime(new Date());
+                    merchantCashPlace.setRootAccountId(Long.valueOf(merchantBaseInfo.getUserId()));
+                    merchantCashPlace.setCode(getCode());
+                    merchantCashPlaceMapper.insert(merchantCashPlace);
+                    UserCashPlace childUserCashPlace = new UserCashPlace();
+                    childUserCashPlace.setChasplaceId(merchantCashPlace.getId());
+                    childUserCashPlace.setCreateTime(new Date());
+                    childUserCashPlace.setIsRootAccount("true");
+                    childUserCashPlace.setOrgCode(userInfo.getLoginName());
+                    childUserCashPlace.setRootAccountId(userInfo.getId().intValue());
+                    childUserCashPlace.setUserId(userInfo.getId());
+                    userCashPlaceMapper.insert(childUserCashPlace);
+                }
             }
         }
     }
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
index 1d97283..7a264dd 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
@@ -140,33 +140,37 @@ public class SxfMerAuditHandler {
             QueryWrapper<MerchantBaseInfo> baseInfoQueryWrapper = new QueryWrapper<>();
             baseInfoQueryWrapper.eq("merchantCode",mcs.getMerchantCode());
             List<MerchantBaseInfo> list = merchantBaseInfoMapper.selectList(baseInfoQueryWrapper);
+
             if (list.size() > 0){
+
                 MerchantBaseInfo merchantBaseInfo = list.iterator().next();
-                MerchantCashPlace merchantCashPlace = new MerchantCashPlace();
-                merchantCashPlace.setAddress(merchantBaseInfo.getAddress());
-                merchantCashPlace.setUserId(Long.valueOf(merchantBaseInfo.getUserId()));
-                merchantCashPlace.setName("收银点一");
-                merchantCashPlace.setPayPassageId(channl);
-                MerchantChannel merchantChannel = merchantChannelMapper.selectById(channl);
-                if (Objects.nonNull(merchantChannel)){
-                    merchantCashPlace.setPayPassageName(merchantChannel.getChannelName());
-                }
-                merchantCashPlace.setPayPassageId(mcs.getChannel());
-                merchantCashPlace.setPayPassageName(mcs.getChannelName());
-                merchantCashPlace.setCreateTime(new Date());
-                merchantCashPlace.setName(merchantBaseInfo.getAlias());
-                merchantCashPlace.setRootAccountId(Long.valueOf(merchantBaseInfo.getUserId()));
-                merchantCashPlace.setCode(getCode());
-                merchantCashPlaceMapper.insert(merchantCashPlace);
                 UserInfo userInfo = userInfoMapper.selectById(merchantBaseInfo.getUserId());
-                UserCashPlace childUserCashPlace = new UserCashPlace();
-                childUserCashPlace.setChasplaceId(merchantCashPlace.getId());
-                childUserCashPlace.setCreateTime(new Date());
-                childUserCashPlace.setIsRootAccount("true");
-                childUserCashPlace.setOrgCode(userInfo.getLoginName());
-                childUserCashPlace.setRootAccountId(userInfo.getId().intValue());
-                childUserCashPlace.setUserId(userInfo.getId());
-                userCashPlaceMapper.insert(childUserCashPlace);
+                if (Objects.nonNull(userInfo) &&!userInfo.getLoginName().contains("-")){
+                    MerchantCashPlace merchantCashPlace = new MerchantCashPlace();
+                    merchantCashPlace.setAddress(merchantBaseInfo.getAddress());
+                    merchantCashPlace.setUserId(Long.valueOf(merchantBaseInfo.getUserId()));
+                    merchantCashPlace.setName("收银点一");
+                    merchantCashPlace.setPayPassageId(channl);
+                    MerchantChannel merchantChannel = merchantChannelMapper.selectById(channl);
+                    if (Objects.nonNull(merchantChannel)){
+                        merchantCashPlace.setPayPassageName(merchantChannel.getChannelName());
+                    }
+                    merchantCashPlace.setPayPassageId(mcs.getChannel());
+                    merchantCashPlace.setPayPassageName(mcs.getChannelName());
+                    merchantCashPlace.setCreateTime(new Date());
+                    merchantCashPlace.setRootAccountId(Long.valueOf(merchantBaseInfo.getUserId()));
+                    merchantCashPlace.setCode(getCode());
+                    merchantCashPlaceMapper.insert(merchantCashPlace);
+                    UserCashPlace childUserCashPlace = new UserCashPlace();
+                    childUserCashPlace.setChasplaceId(merchantCashPlace.getId());
+                    childUserCashPlace.setCreateTime(new Date());
+                    childUserCashPlace.setIsRootAccount("true");
+                    childUserCashPlace.setOrgCode(userInfo.getLoginName());
+                    childUserCashPlace.setRootAccountId(userInfo.getId().intValue());
+                    childUserCashPlace.setUserId(userInfo.getId());
+                    userCashPlaceMapper.insert(childUserCashPlace);
+                }
+
             }
         }
     }