Merge remote-tracking branch 'origin/master'

src/Common/Config/CfgCenter.php

@@ -23,6 +23,7 @@ class CfgCenter
 	const PAY_YUNMAI_ISP = 'pay_yunmai_isp'; //云脉的支付服务商配置，用于托管子商户
 	const PAY_YUNMAI_ISP = 'pay_yunmai_isp'; //云脉的支付服务商配置，用于托管子商户
 	const PAY_ZHIMEI     = 'pay_zhimei'; //致美的支付配置
 	const PAY_ZHIMEI     = 'pay_zhimei'; //致美的支付配置
 	const PAY_TRANSFER   = 'pay_transfer'; //提现打款专用的支付配置
 	const PAY_TRANSFER   = 'pay_transfer'; //提现打款专用的支付配置
+	const PAY_YUNMAIKEJI = 'pay_yunmaikeji'; // 云脉科技支付
 	const SELLER_DISTRIBUTION = 'seller_distribution'; //卖家分销配置
 	const SELLER_DISTRIBUTION = 'seller_distribution'; //卖家分销配置
 	const MP_ZHIMEI      = 'mp_zhimei'; //致美的公众号配置
 	const MP_ZHIMEI      = 'mp_zhimei'; //致美的公众号配置
 	const MP_OEMADM      = 'mp_oemadm'; // OEM机构管理员公众号后台，使用云脉科技公众号
 	const MP_OEMADM      = 'mp_oemadm'; // OEM机构管理员公众号后台，使用云脉科技公众号

src/Order/Enum/PayOriginEnum.php

@@ -10,4 +10,5 @@ class PayOriginEnum
     const TIMESCARD = 5;//次卡支付
     const TIMESCARD = 5;//次卡支付
     const BUYER_MP = 6;//买家公众号
     const BUYER_MP = 6;//买家公众号
     const QUICKPAY_H5 = 7;// h5页面快速支付
     const QUICKPAY_H5 = 7;// h5页面快速支付
+    const YUNMAIKJ_MP = 8; // 云脉科技公众号支付
 }
 }
\ No newline at end of file