...
|
...
|
@@ -180,23 +180,21 @@ exports.ticketsOrderCompute = (uid, productSku, buyNumber, yohoCoin) => { |
|
|
* @param string $couponCode 优惠券码
|
|
|
* @param mixed $yohoCoin 使用的有货币数量或为空
|
|
|
* @param string $skuList 购买限购商品时需要传递的参数
|
|
|
* @param string $qhyUnio 友盟有关信息
|
|
|
* @param string|null $userAgent 联盟过来用户下单时需要的User-Agent信息
|
|
|
* @param int $times
|
|
|
* @param null $activityInfo 套餐数据
|
|
|
* @param isWechat 是否是微信商城
|
|
|
* @param otherParams 其他参数
|
|
|
* @return array 接口返回的数据
|
|
|
*/
|
|
|
exports.orderSub = (uid, addressId, cartType, deliveryTime,
|
|
|
deliveryWay, invoices, paymentId, paymentType, remark,
|
|
|
couponCode, yohoCoin, skuList, qhyUnio,
|
|
|
userAgent, times, activityInfo, ip, isWechat) => {
|
|
|
if (!qhyUnio) {
|
|
|
qhyUnio = '';
|
|
|
couponCode, yohoCoin, skuList, times, activityInfo, otherParams) => {
|
|
|
if (!otherParams.unionKey) {
|
|
|
otherParams.unionKey = '';
|
|
|
}
|
|
|
|
|
|
if (!userAgent) {
|
|
|
userAgent = null;
|
|
|
if (!otherParams.userAgent) {
|
|
|
otherParams.userAgent = null;
|
|
|
}
|
|
|
|
|
|
if (!times) {
|
...
|
...
|
@@ -221,8 +219,7 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime, |
|
|
|
|
|
return shoppingAPI.orderSub(uid, addressId, cartType, deliveryTime,
|
|
|
deliveryWay, invoices, paymentId, paymentType,
|
|
|
remark, couponCode, yohoCoin, skuList, qhyUnio,
|
|
|
userAgent, times, activityInfo, ip, isWechat).then(orderSubRes => {
|
|
|
remark, couponCode, yohoCoin, skuList, times, activityInfo, otherParams).then(orderSubRes => {
|
|
|
let finalResult = {};
|
|
|
|
|
|
if (orderSubRes && orderSubRes.data && orderSubRes.data.is_hint === 'Y') {
|
...
|
...
|
|