Skip to content

D
DataCenter_Core2.1_20190520
Commit cfc32977 by guanzhenshan
Options

上传销售平台流水增加月份的判断

parent 542f4d4c
Showing with 69 additions and 25 deletions
Bailun.DC.Models/DataWareHouse/flowing_sales.cs
......@@ -30,5 +30,7 @@ namespace Bailun.DC.Models.DataWareHouse
public string platformsku { get; set; }
public string createuser { get; set; }
}
}
Bailun.DC.Services/DataWareHouse/PlatformOrderServices.cs
......@@ -40,7 +40,7 @@ namespace Bailun.DC.Services.DataWareHouse
/// <param name="month">月份</param>
/// <param name="total">符合条件的记录数</param>
/// <returns></returns>
public List<Models.DataWareHouse.flowing_sales> List(int page, string platform, string website, string account,DateTime? start,DateTime? end,string orderno,ref int total,int pagesize)
public List<Models.DataWareHouse.flowing_sales> List(int page, string platform, string website, string account,DateTime? start,DateTime? end,string orderno,string month,ref int total,int pagesize)
{
var sql = "select * from flowing_sales t1 where 1=1";
var sqlparam = new DynamicParameters();
......@@ -63,13 +63,13 @@ namespace Bailun.DC.Services.DataWareHouse
sqlparam.Add("account", account);
}
//if(!string.IsNullOrEmpty(month))
//{
// sql += " and t1.month=@month";
// sqlparam.Add("month", month);
//}
if (!string.IsNullOrEmpty(month))
{
sql += " and t1.month=@month";
sqlparam.Add("month", month);
}
if(!string.IsNullOrEmpty(orderno))
if (!string.IsNullOrEmpty(orderno))
{
sql += " and t1.orderno=@orderno";
sqlparam.Add("orderno", orderno);
......@@ -115,7 +115,7 @@ namespace Bailun.DC.Services.DataWareHouse
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
public Models.DataWareHouse.flowing_sales Get(string platform,string website,DateTime? start,DateTime? end)
public Models.DataWareHouse.flowing_sales Get(string platform,string website,DateTime? start,DateTime? end,string month)
{
var sql = "select * from flowing_sales where 1=1";
var sqlParam = new DynamicParameters();
......@@ -140,6 +140,12 @@ namespace Bailun.DC.Services.DataWareHouse
sql += $" and datatime<'{end.Value.AddDays(1).ToString("yyyy-MM-dd")}'";
}
if (!string.IsNullOrEmpty(month))
{
sql += $" and month=@month";
sqlParam.Add("month", month);
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_DW))
{
if (cn.State == System.Data.ConnectionState.Closed)
......
Bailun.DC.Web/Areas/DataWareHouse/Controllers/PlatformOrderController.cs
......@@ -35,7 +35,7 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
[HttpPost]
public JsonResult OrderBillingsJson(int page,string platform,string website,string account,DateTime? start,DateTime? end,string orderno, int pagesize = 25)
public JsonResult OrderBillingsJson(int page,string platform,string website,string account,DateTime? start,DateTime? end,string orderno,string month, int pagesize = 25)
{
if (string.IsNullOrEmpty(platform))
{
......@@ -67,7 +67,7 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
}
int total = 0;
var obj = new Services.DataWareHouse.PlatformOrderServices().List(page, platform, website, account, start,end,orderno, ref total,pagesize);
var obj = new Services.DataWareHouse.PlatformOrderServices().List(page, platform, website, account, start,end,orderno, month, ref total,pagesize);
var list = obj.Select(a => new {
a.accountname,
......@@ -90,7 +90,7 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
});
}
public ActionResult ExportOrderBillings(string platform, string website, string account, DateTime? start,DateTime? end,string orderno)
public ActionResult ExportOrderBillings(string platform, string website, string account, DateTime? start,DateTime? end,string orderno,string month)
{
if (string.IsNullOrEmpty(platform))
{
......@@ -121,7 +121,7 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
var total = 0;
var obj = new Services.DataWareHouse.PlatformOrderServices().List(1, platform, website, account, start,end, orderno, ref total, 0);
var obj = new Services.DataWareHouse.PlatformOrderServices().List(1, platform, website, account, start,end, orderno, month, ref total, 0);
if(obj.Count==0)
{
......@@ -204,14 +204,14 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
public ActionResult DownLoadOrderBillingTemplate(string platform,string website,DateTime? start,DateTime? end)
public ActionResult DownLoadOrderBillingTemplate(string platform,string website,DateTime? start,DateTime? end,string month)
{
if (string.IsNullOrEmpty(platform))
{
return Content("请选择完平台再导出");
}
var obj = new Services.DataWareHouse.PlatformOrderServices().Get(platform, website, start, end);
var obj = new Services.DataWareHouse.PlatformOrderServices().Get(platform, website, start, end, month);
if (obj == null)
{
return Content("系统没有该平台的模版可导出，你可自定义一个模版，后面的导入都以本次导入的格式作为新模板。");
......@@ -286,9 +286,26 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
/// <returns></returns>
//[BailunAuthentication(LoginMode.Enforce)]
[DisableRequestSizeLimit]
public JsonResult UploadOrderBilling(string platform, string website)
public JsonResult UploadOrderBilling(string platform, string website,string month)
{
if (string.IsNullOrEmpty(platform))
{
return Json(new
{
success = false,
msg = "请选择平台"
});
}
if (string.IsNullOrEmpty(month))
{
return Json(new
{
success = false,
msg = "请选择月份"
});
}
if (Request.Form.Files.Count == 0)
{
return Json(new
......@@ -316,7 +333,7 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
accountname = "",
createtime = DateTime.Now,
jsondata = Newtonsoft.Json.JsonConvert.SerializeObject(item),
month = "",
month = month,
platform = platform,
website = website??"",
orderno = "",
......
Bailun.DC.Web/Areas/DataWareHouse/Views/PlatformOrder/OrderBillings.cshtml
......@@ -38,6 +38,12 @@
}
</div>
</div>
<div class="form-group">
<label>账单月份</label>
<input id="month" name="month" style="width:100px" class="form-control" placeholder="请选择月份" />
</div>
<div class="form-group" style="margin-left:10px">
<label>时间</label>
@*<input id="month" name="month" class="form-control" style="width:100px" value="@(DateTime.Now.AddMonths(-1).ToString("yyyy-MM"))" />*@
......@@ -230,6 +236,7 @@
laydate.render({ elem: '#start' });
laydate.render({ elem: '#end' });
laydate.render({ elem: '#month', type: 'month' });
initUpload();
......@@ -268,6 +275,7 @@
var start = $('#start').val();
var end = $('#end').val();
var orderno = $('#orderno').val();
var month = $('#month').val();
if (platform == '') {
alert('请选择平台');
......@@ -278,7 +286,7 @@
$.submit({
url: '@Url.Content("~/DataWareHouse/PlatformOrder/OrderBillingsJson")',
type:'POST',
paramData: 'page=' + current_page + '&platform=' + platform+'&website=' + website + '&start=' + start + '&end=' + end + '&orderno=' + orderno,
paramData: 'page=' + current_page + '&platform=' + platform + '&website=' + website + '&start=' + start + '&end=' + end + '&orderno=' + orderno + '&month=' + month,
func: function (result) {
layer.close(load_index)
$('#tb_head').html('');
......@@ -338,13 +346,20 @@
return false;
}
var month = $('#month').val();
//if (month == '') {
// alert('请选择月份');
// return false;
//}
//if (websitecount > 0 && website == '') {
// alert('请选择站点，再下载导入模版。');
// return false;
//}
uploadfile('btn_Upload',
'@Url.Content("~/DataWareHouse/PlatformOrder/UploadOrderBilling")' + '?platform=' + platform + '&website=' + website,
'@Url.Content("~/DataWareHouse/PlatformOrder/UploadOrderBilling")' + '?platform=' + platform + '&website=' + website + '&month=' + month,
function(result){
if(result.success)
{
......@@ -423,12 +438,10 @@
alert('请选择平台');
return false;
}
//if (month == '') {
// alert('请选择月份');
// return false;
//}
var month = $('#month').val();
window.open('@Url.Content("~/DataWareHouse/PlatformOrder/ExportOrderBillings")' + '?platform=' + platform+'&website=' + website + '&start=' + start + '&end=' + end + '&orderno=' + orderno);
window.open('@Url.Content("~/DataWareHouse/PlatformOrder/ExportOrderBillings")' + '?platform=' + platform + '&website=' + website + '&start=' + start + '&end=' + end + '&orderno=' + orderno + '&month=' + month);
}
function Export_Voucher() {
......@@ -466,8 +479,14 @@
var start = $('#start').val();
var end = $('#end').val();
var orderno = $('#orderno').val();
var month = $('#month').val();
if (month == '') {
alert('请选择月份');
return false;
}
window.open('@Url.Content("~/DataWareHouse/PlatformOrder/DownLoadOrderBillingTemplate?platform=")' + platform + '&website=' + website + '&start=' + start + '&end=' + end,'_blank');
window.open('@Url.Content("~/DataWareHouse/PlatformOrder/DownLoadOrderBillingTemplate?platform=")' + platform + '&website=' + website + '&start=' + start + '&end=' + end + '&month=' + month, '_blank');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment