Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js

@@ -917,6 +917,9 @@ class UtilsOrderService extends AppServiceBase {
         opOrderResult.data = null;
         opOrderResult.data = null;
         return opOrderResult;
         return opOrderResult;
       }
       }
+      if(!opOrderResult.data){
+        return opOrderResult;
+      }
       opOrderResult.data.appInfo = {
       opOrderResult.data.appInfo = {
         uapp_id: appInfo.uapp_id,
         uapp_id: appInfo.uapp_id,
         uapp_key: appInfo.uapp_key,
         uapp_key: appInfo.uapp_key,

center-channel/app/config/routes/api.js

@@ -209,10 +209,8 @@ module.exports = function (app) {
 				content: "支付回调处理结果：" + JSON.stringify(result),
 				content: "支付回调处理结果：" + JSON.stringify(result),
 				clientIp: client_ip || ""
 				clientIp: client_ip || ""
 			});
 			});
-			if (result.status != 0) {
-				return res.end("FAIL");
-			}
-			return res.end("success");
+			var returnObj = JSON.stringify(result);
+			return res.end(returnObj);
 		} catch (e) {
 		} catch (e) {
 			var client_ip = system.get_client_ip(req);
 			var client_ip = system.get_client_ip(req);
 			logCtl.error({
 			logCtl.error({