修改数据报告检索日志

core/src/qfw/manage/dataExport.go

@@ -66,11 +66,11 @@ func (d *DataExport) DataDetail(order_code string) error {
 	(*res)["product_type"] = "历史数据导出"
 	(*res)["order_money"] = orderMoney
 	(*res)["order_status"] = "未支付"
-
+	payway := util.ObjToString((*res)["pay_way"])
 	//微信订单编号
-	if (*res)["pay_way"] == "微信" || (*res)["pay_way"] == "支付宝" {
+	if strings.Contains(payway, "wx") || strings.Contains(payway, "ali") {
 		table := "weixin_pay"
-		if (*res)["pay_way"] == "支付宝" {
+		if strings.Contains(payway, "ali") {
 			table = "ali_pay"
 		}
 		wxPayMap := map[string]interface{}{}
@@ -79,7 +79,7 @@ func (d *DataExport) DataDetail(order_code string) error {
 		if wxpay != nil {
 			d.T["transaction_id"] = util.ObjToString((*wxpay)["transaction_id"])
 		}
-	} else if (*res)["pay_way"] == "线下支付" {
+	} else if payway == "线下支付" {
 		offlinePayMap := map[string]interface{}{}
 		offlinePayMap["out_trade_no"] = (*res)["out_trade_no"]
 		offlinePay := cutil.Mysql.FindOne("offline_pay", offlinePayMap, "", "create_time desc")
@@ -155,6 +155,11 @@ func (d *DataExport) DataDetail(order_code string) error {
 			fiterMap["subtype"] = subtypeStr
 		}
 	}
+	if strings.Contains(payway, "wx") {
+		(*res)["pay_way"] = "微信"
+	} else if strings.Contains(payway, "ali") {
+		(*res)["pay_way"] = "支付宝"
+	}
 	d.T["isExit"] = isExit
 	d.T["res"] = *res
 	d.T["filterData"] = fiterMap

core/src/qfw/manage/dataReportOrder.go

@@ -59,7 +59,7 @@ func (d *DataReportOrder) Pageing() {
 	}
 	if endTime != 0 {
 		sql = sql + "and pay_time < ? "
-		val = append(val, time.Unix(endTime, 0).Format(qutil.Date_Full_Layout))
+		val = append(val, time.Unix(endTime, 0).AddDate(0, 0, 1).Format(qutil.Date_Full_Layout))
 	}
 
 	if query != "" {

core/src/web/templates/manage/datareport/index.html

@@ -81,7 +81,7 @@ $(function(){
 		  ,idField:"_id"
 		  ,classname:"table-hover"
 		  ,css:{"height":"450px"}
-		  ,buttons: ['<div style="margin: 0px 15px;"><div style="width:40%;margin:5px" class="input-group pull-right" id="search"><input type="text" id="searchtext" value=""  data-original-title="Search" class="form-control" placeholder="微信用户名/手机号"><span class="input-group-btn"><button class="btn btn-success" onclick="SearchContent()" data-original-title="Search" id="searchtip" type="button" style="height:38px;width:70px;">检索</button></span></div><div style="margin:5px;" class="controls pull-left"><input type="text" style="background:#fff url({{Msg "seo" "cdn"}}/images/datePicker.gif) no-repeat right;"  id="starttime"  datatype="*" type="text" name="starttime" class="form-control" onClick="WdatePicker({oncleared:function(dp){oncleared(dp,this)},onpicked:function(dp){picked(dp,this)},dateFmt:\'yyyy-MM-dd\',maxDate:\'#F{$dp.$D(\\\'endtime\\\',{d:0})}\'})" readonly="ture" value="" placeholder="时间选择"></div><div class="controls pull-left" id="zhi" style="line-height: 46px;">至</div><div style="margin:5px;" class="controls pull-left"><input type="text"   style="background:#fff url({{Msg "seo" "cdn"}}/images/datePicker.gif) no-repeat right;"  id="endtime"  datatype="*" type="text" name="endtime" class="form-control" onClick="WdatePicker({oncleared:function(dp){oncleared(dp,this)},onpicked:function(dp){picked(dp,this)},dateFmt:\'yyyy-MM-dd\',minDate:\'#F{$dp.$D(\\\'starttime\\\',{d:0})}\'})" readonly="ture" value="" placeholder="时间选择"></div></div><div id="second"><div class="pull-right" id="allDoBut" style="display: none;"><button id="allDel" onclick="del(\'\',\'A\',\'\')" type="button" class="btn btn-primary">删除</button><button id="allPush" onclick="push(\'all\',\'\')" type="button" class="btn btn-warning">补推</button></div></div>']
+		  ,buttons: ['<div style="margin: 0px 15px;"><div style="width:40%;margin:5px" class="input-group pull-right" id="search"><input type="text" id="searchtext" value=""  data-original-title="Search" class="form-control" placeholder="姓名/手机号"><span class="input-group-btn"><button class="btn btn-success" onclick="SearchContent()" data-original-title="Search" id="searchtip" type="button" style="height:38px;width:70px;">检索</button></span></div><div style="margin:5px;" class="controls pull-left"><input type="text" style="background:#fff url({{Msg "seo" "cdn"}}/images/datePicker.gif) no-repeat right;"  id="starttime"  datatype="*" type="text" name="starttime" class="form-control" onClick="WdatePicker({oncleared:function(dp){oncleared(dp,this)},onpicked:function(dp){picked(dp,this)},dateFmt:\'yyyy-MM-dd\',maxDate:\'#F{$dp.$D(\\\'endtime\\\',{d:0})}\'})" readonly="ture" value="" placeholder="时间选择"></div><div class="controls pull-left" id="zhi" style="line-height: 46px;">至</div><div style="margin:5px;" class="controls pull-left"><input type="text"   style="background:#fff url({{Msg "seo" "cdn"}}/images/datePicker.gif) no-repeat right;"  id="endtime"  datatype="*" type="text" name="endtime" class="form-control" onClick="WdatePicker({oncleared:function(dp){oncleared(dp,this)},onpicked:function(dp){picked(dp,this)},dateFmt:\'yyyy-MM-dd\',minDate:\'#F{$dp.$D(\\\'starttime\\\',{d:0})}\'})" readonly="ture" value="" placeholder="时间选择"></div></div><div id="second"><div class="pull-right" id="allDoBut" style="display: none;"><button id="allDel" onclick="del(\'\',\'A\',\'\')" type="button" class="btn btn-primary">删除</button><button id="allPush" onclick="push(\'all\',\'\')" type="button" class="btn btn-warning">补推</button></div></div>']
 		  , url: '/manage/dataReport/p'
 		  , columns: [
 				{