1

Bailun.DC.Web/Areas/DataWareHouse/Controllers/PlatformOrderController.cs

@@ -606,6 +606,12 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
 
         }
 
+        public JsonResult UploadFinanceAccount()
+        {
+
+            return Json("");
+        }
+
         #endregion
 
     }

Bailun.DC.Web/Areas/DataWareHouse/Views/Logistics/List.cshtml

@@ -495,6 +495,7 @@
                     func: function (result) {
                         if (result.success) {
                             alert('文件上传成功，后台会自动解析文件，请稍后再查看数据解析情况！');
+                            $('#txt_tip').html('');
                         }
                         else {
                             alert(result.msg);

Bailun.DC.Web/Areas/DataWareHouse/Views/PlatformOrder/FinanceAccount_OrderBilling.cshtml

@@ -61,6 +61,7 @@
                         <label>&nbsp;</label>
                         <button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
                         <button type="button" class="btn btn-success" onclick="exportxls();">导出</button>
+                        <button id="btn_uploadFlowing" type="button" class="btn btn-warning">导入流水</button>
                     </div>
                 </div>
             </form>
@@ -126,6 +127,8 @@
                 //获取平台
                 getPlatform();
             })
+
+            initUpload();
         })
 
         function list() {
@@ -244,5 +247,63 @@
             })
         }
 
+        function initUpload() {
+            uploadfile('btn_uploadFlowing',
+                '@Url.Content("~/DataWareHouse/PlatformOrder/UploadFileFragment")' + '?platform=' + platform + '&website=' + website + '&month=' + month,
+                function(result){
+                    if(result.success)
+                    {
+                        alert('文件上传成功');
+                        
+                    }
+                    else
+                    {
+                        alert(result.msg);
+                    }
+                });
+        }
+
+        function uploadfile(id,url,callback)
+        {
+            var _GUID = WebUploader.Base.guid();//一个GUID
+            var uploader = new WebUploader.Uploader({
+                // swf文件路径
+                swf: BASE_URL + 'Uploader.swf',
+                // 文件接收服务端。
+                server: url!=undefined?url:'@Url.Content("~/File/UploadFile")',
+                // 选择文件的按钮。可选。
+                // 内部根据当前运行是创建，可能是input元素，也可能是flash.
+                pick: '#'+id,
+                // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
+                resize: false,
+                auto: true,
+                timeout: 0,
+                accept: {
+                    extensions: "xls,xlsx",
+                    mimeTypes: ".xls,.xlsx"
+                },
+                chunked: false,//开始分片上传
+                chunkSize: 2048000,//每一片的大小
+                formData: {
+                    guid: _GUID //自定义参数，待会儿解释
+                }
+            });
+
+            uploader.on('uploadSuccess', function (file, response) {
+                if (callback) {
+                    callback(response);
+                }
+            });
+
+            uploader.on('uploadProgress', function (file, percentage) {
+                //$("#uploader .progress-bar").width(percentage * 100 + '%');
+                $('#txt_tip').html('正在上传文件，当前进度：' + percentage * 100 + '%');
+            });
+
+            uploader.on('uploadError', function (file) {
+                layer.msg("上传出错");
+            });
+        }
+
     </script>
 }

Bailun.DC.Web/Areas/DataWareHouse/Views/PlatformOrder/OrderBillings.cshtml

@@ -371,10 +371,12 @@
 
             uploadfile('btn_Upload',
                 '@Url.Content("~/DataWareHouse/PlatformOrder/UploadFileFragment")' + '?platform=' + platform + '&website=' + website + '&month=' + month,
+                //'http://192.168.6.251:8085/upload/UploadFileFragment',
                 function(result){
                     if(result.success)
                     {
                         alert('文件上传成功，后台会自动解析文件，请稍后再查看数据解析情况！');
+                        $('#txt_tip').html('');
                     }
                     else
                     {
@@ -527,7 +529,8 @@
                 $.submit({
                     type:'post',
                     url: '@Url.Content("~/DataWareHouse/PlatformOrder/MergeUploadFile")',
-                    paramData: 'guid=' + _GUID + '&filename=' + file.name + '&platform=' + platform + '&website=' + website+'&month='+month,
+                    //url: 'http://192.168.6.251:8085/upload/merge',
+                    paramData: 'guid=' + _GUID + '&filename=' + file.name + '&platform=' + platform + '&website=' + website + '&month=' + month +'&bucket=bailun-data-center',
                     func: function (result) {
                         if (result.success) {
                             alert('文件上传成功，后台会自动解析文件，请稍后再查看数据解析情况！');

Bailun.DC.Web/Areas/Reports/Views/Orders/ListOrderDetail.cshtml

@@ -198,6 +198,10 @@
                     if (result != null && result != undefined) {
                         $('#platform').html('<option value="">选择平台</option>');
                         for (var i = 0; i < result.length; i++) {
+                            if (result[i] == "shopify") {
+                                result[i] = "Shopify";
+                            }
+
                             $('#platform').append('<option value="' + result[i] + '">' + result[i]+'</option>');
                         }
 

Bailun.DC.Web/Base/BaseController.cs

@@ -199,6 +199,40 @@ namespace Bailun.DC.Web.Base
         {
             //uploadfiles
 
+            if (string.IsNullOrEmpty(guid))
+            {
+                return Json(
+                    new
+                    {
+                        success = false,
+                        msg = "guid不能为空"
+                    }
+                );
+            }
+
+            if (string.IsNullOrEmpty(platform))
+            {
+                return Json(
+                    new
+                    {
+                        success = false,
+                        msg = "平台类型不能为空"
+                    }
+                );
+            }
+
+            if (string.IsNullOrEmpty(month))
+            {
+                return Json(
+                    new
+                    {
+                        success = false,
+                        msg = "请填写月份"
+                    }
+                );
+            }
+
+
             var uploadDir = Directory.GetCurrentDirectory() + "\\tempUploadFile"; //Upload 文件夹
             var dir = Path.Combine(uploadDir, guid);//临时保存分块的目录
             var files = System.IO.Directory.GetFiles(dir);//获得下面的所有文件
@@ -236,6 +270,7 @@ namespace Bailun.DC.Web.Base
             var result = _platformService.SaveFileData(uploadFile);
 
             fs.Close();
+            fs.Dispose();
             Directory.Delete(dir);//删除文件夹
 
 
@@ -254,6 +289,9 @@ namespace Bailun.DC.Web.Base
             //把七牛云返回的hash值更新到文件记录里面
             result += _platformService.UpdateFileData(uploadFile.id, uploadFile.hashcode, uploadFile.filekey);
 
+            fs.Close();
+            fs.Dispose();
+
             return Json(
                 new {
                     success = string.IsNullOrEmpty(result),