扫码pos机支付，改之前的部分bug

pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java

@@ -7,6 +7,7 @@ import cn.pluss.platform.api.Result;
 import cn.pluss.platform.api.ResultCode;
 import cn.pluss.platform.api.ResultGenerator;
 import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.deviceStock.DeviceStockService;
 import cn.pluss.platform.dto.*;
 import cn.pluss.platform.entity.*;
 import cn.pluss.platform.exception.MsgException;
@@ -69,6 +70,8 @@ public class MerchantOrderController {
     private final SxfPayService sxfPayService;
     private final RyxPayService ryxPayService;
     private final MerchantChannelStatusMapper merchantChannelStatusMapper;
+    @Autowired
+    private DeviceStockService deviceStockService;
 
     @Setter(onMethod_ = {@Lazy, @Autowired})
     private IdCardService idCardService;
@@ -437,13 +440,16 @@ public class MerchantOrderController {
         boolean sign = token.get("TOKEN").equals(merchantOrderDTO.getToken());
         System.out.println(token);
         MsgException.check(!sign,"签名错误");
-        //通过后进行支付操作
-        UserApp tokenUa = userAppService.queryUserAppByToken();
-        merchantOrderDTO.setMerchantCode(tokenUa.getMerchantCode());
+        //通过后查询商户信息
+        DeviceStock deviceStock = deviceStockService.checkBind(merchantOrderDTO.getSn());
+        MerchantBaseInfo merchantBaseInfoById = merchantBaseInfoService.getMerchantBaseInfoById(Integer.valueOf(deviceStock.getActMercId()));
+        MsgException.checkNull(merchantBaseInfoById, "找不到商户");
+        merchantOrderDTO.setMerchantCode(merchantBaseInfoById.getMerchantCode());
         //校验金额
         if (!StringUtil.isMoney(String.valueOf(merchantOrderDTO.getConsumeFee()))){
             MsgException.throwException("金额异常");
         }
+        //进行支付操作
         try {
             return merchantOrderService.toActivePay(merchantOrderDTO);
         } catch (Exception e){

pluss-common-bundle/src/main/java/cn/pluss/platform/util/TokenUtil.java

@@ -25,6 +25,8 @@ public class TokenUtil {
     private static final String USER_CODE = "ZF544";
     //APPSECRET
     private static final String APP_SECRET = "2022bsjZF544GAH";
+    //sn
+    private static final String SN = "BSJQG01YJ0001";
 
     /**
      * 获取TOKEN值

pluss-common-bundle/src/main/resources/config/application-ys.yml

@@ -30,9 +30,9 @@ ys:
   ## 进件私钥v2
   priKeyV2:
     ## 进件公钥v2
-  pubKeyV2:
+  pubKeyV2: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7SPkmIUf2auwkgbVchMyfeCDgICuA1GKrSwRbDI24UMVhzDgcIxCUmFG5/DfcPJz0d3oV9Ggkd4/7NmteRvmNnOOGNOnmR6AGEKafDpL1mAdpndmpkAZ0f6OVo3Py5JDg2wt8d+u3dF0AFWwd2rrrqscWvxJVB55DnuZfXl2CyQIDAQAB
     ## 加密密钥
-  encryptPwd:
+  encryptPwd: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD2J82Gg79Tk8HZ9Zl7EOeLwvUn41c4ktUg6jveIhYLhT/PW5hpPAtgKXd9BvhtpfXhzbK6U9UURKhBgFIkQ+oIJQNfbB/F2jdVK9ke3IYi0/TXHMnY63x43qxciLeAOt+LxdhHn6ZImV4MsRkPjF/zLsaJrPOPWbc2m4T1yvinfzkrxhZaWn1dj4+IdyO3tA/juXCjydQqKR2kSqJlo6gdT9N3RIJ+ETda2UUahZyYXBfjyxFQEaOXthm6krZH1zBHs510Og6bQJQHjMmTskkslWvj38qPDfsuC4tq0Hgbu3LcyiX9vGYzQoGOaGhDEiNPObdDlOuh5gn0slRmg+PxAgMBAAECggEAJRvrCBRki50C5HD6Kmtp/M/vVYwYYhcAum2ViO9qk2ILNJ+CYpsCvASEVvzuBtm2L8xq3Vw2C1AubXGC8KSsa33o/EG4qIM1REnP+a8VKbr6dlOIuoMFyNMI+QpDX7mAafnxmRqgXuGAJDmupYFsFaU/mRHRxhKoZDsd2FA5HEbuDI9SJp86keE72NHsxyqfDIZyIk3Z8k7HZY2wg3FW+YaOKQBHVA9JYvhfZMeaQ1ymrA0IAqWpUqjLkqAa2Qa6xUsbj+QhvrkBCE48i8duamXKDSOaLfkqTb8IyxOM9eTsFwLVGEuZQrkhrLxdrg5aBPvu81pIJME6SgrquJJ84QKBgQD/MAFLiWU0wDJ4Hqf2jKa5vgrBmCqOsANBc079s8gDXM4zbsG/TjMHPDmiOGZxtDG8937twjYzRv9XpnqyITMArlhWWMhTOJ3r3CTVr/OISgeZKPGjfp+MbeDsOK4OggTVKZmNLx3nKiuc94IlTDOcz5qArVBTxKadWg56f1UGswKBgQD28G+haXxneMhRZozoHPjcfdgtDoZJaVa8XTXw8nvQala5ioU9yesbIAdtD/VR/eWwuMtO4rK1IFxtNZQ/MtSXwqlnKLf1xDJQPuj3kY5mC7H7sn4HGeFDP50VFnPgIaUnB5VwgyYFm8l19AW06OBjlnoBv0dnl1s5u+DgpzQcywKBgQCfeWSVzBtPR/1CTAYzcdqPoVAfg/S0jxK5yFHJAp0wXMMQKVszLq99CgoKcqyyyiV7LkBIXWJ50RipsgRjZZP2DP5vl7Q5LdyjFUR/tiG/PmRZNtkrj2ot3Ez/0rwTnPVgMUsgjB1n5Va0FYljvadTi/nGCIl2kCJ/m1QJAaIlOQKBgGV8TwRxS9ViiEEb+lDyhzxm488wpvPIvQLQ8/hAT65J5bZ/PV81etA9C5BA/Ltjs2A7siKLfJJ/6DxhxrlqdICiWeixjVkN9vePw0LrqTA7IjylELJuamuu2yntflXgvfUaYspIu/mWGufFEAtXodCL6TyKlhf21mEV28e4L+ydAoGAItgCUGbot95QNT1z+9QFN+18AvMnWCNvqanrC4qsk0phjYX9FFwfSCqWVeVm0Q0+2tUrRNcUEcbmlbQToBZq/hSu0nPcZIPvnNxLfW/NY7eVCXIcI5eNPjUIgbRCVMc6w5ukYMxPidOBuRXIt1iq2+iV20/FMbA58sY7AgOiaMw=
   oldPayV2:
     ## 交易发起方编号 收银呗（武汉）科技有限公司
     srcMerchantNo:

pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java

@@ -285,12 +285,16 @@ public class AliyunServiceImpl implements AliyunService {
         if ("403".equals(verifyBankElementResponse.getBody().getCode())){
             throw new MsgException("24小时内重复查询相同信息超过10次，已锁定，请在12小时后重试。");
         }
+        if ("428".equals(verifyBankElementResponse.getBody().getCode())){
+            throw new MsgException("请正确输入相关信息");
+            
+        }
         if (!"200".equals(verifyBankElementResponse.getBody().getResultObject().getSubCode())) {
             if ("403".equals(verifyBankElementResponse.getBody().getResultObject().getSubCode())) {
                 throw new MsgException("银行卡认证接口已欠费，请联系平台");
             }else if ("201".equals(verifyBankElementResponse.getBody().getResultObject().getSubCode())){
                 throw new MsgException("用户的身份信息不匹配");
-            } else {
+            }else {
                 throw new MsgException("银行卡认证失败");
             }
         }

pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/DeviceStockService.java

@@ -99,4 +99,6 @@ public interface DeviceStockService extends IService<DeviceStock> {
      * @param dto
      */
     void bindDevcieV2(DeviceStockDTO dto);
+
+    DeviceStock checkBind(String sn);
 }

pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java

@@ -391,6 +391,14 @@ public class DeviceStockServiceImpl extends ServiceImpl<DeviceStockMapper, Devic
         deviceOperateInfoService.save(operateInfo);
     }
 
+    @Override
+    public DeviceStock checkBind(String sn) {
+        MsgException.checkBlank(sn, "缺失设备SN号");
+        DeviceStock deviceBySnNo = baseMapper.getDeviceBySnNo(sn);
+        MsgException.checkBlank(deviceBySnNo.getActMercId(),"未绑定扫码pos");
+        return deviceBySnNo;
+    }
+
     @Override
     public <E extends IPage<DeviceStock>> E page(E page, Wrapper<DeviceStock> queryWrapper) {
         DeviceStock deviceStock = queryWrapper.getEntity();

pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantBaseInfoService.java

@@ -46,6 +46,12 @@ public interface MerchantBaseInfoService extends IService<MerchantBaseInfo> {
 
     MerchantBaseInfo queryMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo);
 
+    /**根据id查找
+     * @param id
+     * @return
+     */
+    MerchantBaseInfo getMerchantBaseInfoById(Integer id);
+
     List<MerchantBaseInfo> queryMerchantBaseInfoList(MerchantBaseInfo merchantBaseInfo);
 
     void saveMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo);

pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantBaseInfoServiceImpl.java

@@ -438,6 +438,12 @@ public class MerchantBaseInfoServiceImpl extends ServiceImpl<MerchantBaseInfoMap
         return baseMapper.queryMerchantBaseInfo(merchantBaseInfo);
     }
 
+    @Override
+    public MerchantBaseInfo getMerchantBaseInfoById(Integer id) {
+        LambdaQueryWrapper<MerchantBaseInfo> qWrapper = new LambdaQueryWrapper<MerchantBaseInfo>().eq(MerchantBaseInfo::getId, id);
+        return baseMapper.selectOne(qWrapper);
+    }
+
     @Override
     public List<MerchantBaseInfo> queryMerchantBaseInfoList(MerchantBaseInfo merchantBaseInfo) {
         return baseMapper.queryMerchantBaseInfoList(merchantBaseInfo);

pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantStaffConnServiceImpl.java

@@ -83,7 +83,7 @@ public class MerchantStaffConnServiceImpl extends ServiceImpl<MerchantStaffConnM
         if (loginName.contains("@")) {
             throw new MsgException("员工账号请不要带@");
         }
-        staffDTO.setLoginName(loginName + "@chaozg");
+        staffDTO.setLoginName(loginName + "@kuaiyin");
         UserInfo existUserInfo = new UserInfo().setLoginName(staffDTO.getLoginName());
         existUserInfo = userInfoService.getOne(new QueryWrapper<>(existUserInfo));
         if (existUserInfo != null) {