fix card

mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java

@@ -227,8 +227,7 @@ public class WxCardPayController extends BaseController {
         Integer payment = totalFee.multiply(new BigDecimal(100)).intValue();
 
         
-        Long merchantId = null;
-
+        Long merchantId = merchantBUser.getMerchantId();
         if(payment > cardInfo.getRemainingAmount()) {
             logger.error("卡余额不足: " + cardInfo.getId());
             return new ResultData(ErrorCode.CARD_REMAIN_AMOUNT_IS_NOT_ENOUGH);