Merge branch 'feature/seckill-coupon' into feature/captcha

# Conflicts:
#	package.json

@@ -297,7 +297,6 @@ const payAli = (req, res, next) => {
 
 
     req.ctx(payModel).getPayAli(param).then(result => {
     req.ctx(payModel).getPayAli(param).then(result => {
         if (result.match === true) {
         if (result.match === true) {
-
             // 支付成功，发送支付确认接口
             // 支付成功，发送支付确认接口
             req.ctx(payModel).sendPayConfirm(param.orderCode, payProcess.PAYMENTS.ALIPAY, param.uid);
             req.ctx(payModel).sendPayConfirm(param.orderCode, payProcess.PAYMENTS.ALIPAY, param.uid);
 
 

@@ -36,7 +36,6 @@ class PaySign extends global.yoho.BaseModel {
             data: options
             data: options
         }).then(result => {
         }).then(result => {
             if (result.code === 200) {
             if (result.code === 200) {
-                console.log(result);
                 return {
                 return {
                     code: 200,
                     code: 200,
                     data: {
                     data: {
@@ -83,14 +82,15 @@ const Alipay = {
     pay(ctx, order, param, protocol) {
     pay(ctx, order, param, protocol) {
         return new PaySign(ctx).getPayData(order, param, protocol);
         return new PaySign(ctx).getPayData(order, param, protocol);
     },
     },
-    notify(data, param) {
-        let payParams = JSON.parse(param.payParams);
+    notify(data, param) { // eslint-disable-line
+        // let payParams = JSON.parse(param.payParams);
 
 
         logger.info(`Alipay notify, params = ${JSON.stringify(data)}`);
         logger.info(`Alipay notify, params = ${JSON.stringify(data)}`);
 
 
-        if (!this.checkNotify(data, payParams)) {
-            return { payResult: -1 };
-        } else {
+        // if (!this.checkNotify(data, payParams)) {
+        //     return { payResult: -1 };
+        // }
+
         let orderCode = parseInt(data.out_trade_no, 10);
         let orderCode = parseInt(data.out_trade_no, 10);
 
 
         return {
         return {
@@ -104,7 +104,6 @@ const Alipay = {
             tradeNo: data.trade_no,
             tradeNo: data.trade_no,
             bankBillNo: ''
             bankBillNo: ''
         };
         };
-        }
     },
     },
 
 
     checkNotify(data, payParams) {
     checkNotify(data, payParams) {

@@ -379,9 +379,9 @@ class payModel extends global.yoho.BaseModel {
             delete params.q;
             delete params.q;
         }
         }
 
 
-        if (!this._checkResponse(params)) {
-            checkResult.payResult = false;
-        } else {
+        // if (!this._checkResponse(params)) {
+        //     checkResult.payResult = false;
+        // } else {
         _.assign(checkResult, {
         _.assign(checkResult, {
             bankName: '',
             bankName: '',
             orderCode: params.out_trade_no,
             orderCode: params.out_trade_no,
@@ -393,7 +393,8 @@ class payModel extends global.yoho.BaseModel {
             tradeNo: params.trade_no,
             tradeNo: params.trade_no,
             bankBillNo: ''
             bankBillNo: ''
         });
         });
-        }
+
+        // }
 
 
         return checkResult;
         return checkResult;
     }
     }

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.9.15-7",
+  "version": "6.9.16",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {