Merge branch 'bpo-admin' of http://gitlab.gongsibao.com/jiangyong/zhichan into bpo-admin

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

@@ -31,8 +31,13 @@ class ChannelApi {
 
 
     //绑定渠道推送
     //绑定渠道推送
     async pushbindingchannel(queryobj, qobj, req) {
     async pushbindingchannel(queryobj, qobj, req) {
-        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'); /*前一天的时间*/
+        if(queryobj.day) {
+            queryobj.begin = queryobj.day + ' 00:00:00'; /* 自定义时间 */
+            queryobj.end = queryobj.day + ' 23:59:59';   /* 自定义时间 */
+        } else {
+            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 result = await this.channelSve.pushbindingchannel(queryobj);
         var data = result.data || [];
         var data = result.data || [];
         if (data.length > 0) {
         if (data.length > 0) {