gsb

bpo-admin/app/base/api/impl/channelApi.js

@@ -34,7 +34,7 @@ class ChannelApi {
         queryobj.begin = moment().subtract(1, 'days').format('YYYY-MM-DD 00:00:00'); /*前一天的时间*/
         queryobj.end = moment().subtract(1, 'days').format('YYYY-MM-DD 23:59:59'); /*前一天的时间*/
         var result = await this.channelSve.pushbindingchannel(queryobj);
-        var data = result.data;
+        var data = result.data || [];
         if (data.length > 0) {
             for (let i = 0; i < data.length; i++) {
                 if (data[i].channel_id == '10000' && data[i].origin_merchant_id != '') {
@@ -66,7 +66,7 @@ class ChannelApi {
                             var rc = system.getObject("util.aliyunClient");
                             var rtn = null;
                             rtn = await rc.post(this.FQURL, pushData);
-                            var result = JSON.parse(system.decryption(pushData.param));
+                            // var result = JSON.parse(pushData.param);
                             if (rtn.success == true) {
                                 result.contractNo = rtn.data.contractNo;
                                 result.topush = "0";
@@ -130,7 +130,7 @@ class ChannelApi {
             "platform_channel_id": chnanel.platform_id,//对方渠道id
         };
         let encry = System.encryption(JSON.stringify(str));
-        resultData.param = system.encryption(encry);
+        resultData.param = encodeURIComponent(system.encryption(encry));
         return resultData;
     }
 
@@ -155,7 +155,7 @@ class ChannelApi {
             "origin_merchant_id": chnanel.origin_merchant_id,//来源商户id
             "platform_channel_id": chnanel.platform_id,//对方渠道id
         };
-        resultData.param = system.encryption(JSON.stringify(str));
+        resultData.param = encodeURIComponent(system.encryption(JSON.stringify(str)));
         return resultData;
     }
 

bpo-admin/app/front/entry/public/js/settle/settleinfo.js

@@ -47,7 +47,7 @@ var app = new Vue({
         } else if(cellValue === "02") {
           return "失败";
         } else if(cellValue === "03") {
-          return "成功";
+          return "失败且退款";
         } else {
           return "";
         }