扫码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){