完善财务会计流水支付宝的数据显示

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

@@ -463,7 +463,7 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
             {
                 company = "香港百伦",
                 a.platform,
-                a.website,
+                website = a.website??"global",
                 a.orderno,
                 a.datatime,
                 a.amountval,
@@ -510,7 +510,7 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
 
             foreach (var item in obj)
             {
-                list.Add("公司主体|"+item.platform+"|"+item.website+"|"+(item.datatime.HasValue?item.datatime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"")+"|"+item.orderno+"|"+(item.fee_config?.feetype ?? "") +"|"+(item.fee_config?.financecategory ?? "")+"|"+(item.fee_config?.datacenter_col ?? "")+"|"+(item.fee_config?.subjectcode ?? "")+"|"+(item.fee_config?.projectcode ?? "")+"|"+ item.fee_config.currency+"|"+(item.amountval)+"|"+(item.exchange_rate.HasValue ? item.exchange_rate.Value + "" : "")+"|"+(item.amountval_rmb.HasValue ? item.amountval_rmb.Value + "" : "")+"|"+item.month);
+                list.Add("公司主体|"+item.platform+"|"+(item.website??"global")+"|"+(item.datatime.HasValue?item.datatime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"")+"|"+item.orderno+"|"+(item.fee_config?.feetype ?? "") +"|"+(item.fee_config?.financecategory ?? "")+"|"+(item.fee_config?.datacenter_col ?? "")+"|"+(item.fee_config?.subjectcode ?? "")+"|"+(item.fee_config?.projectcode ?? "")+"|"+ item.fee_config.currency+"|"+(item.amountval)+"|"+(item.exchange_rate.HasValue ? item.exchange_rate.Value + "" : "")+"|"+(item.amountval_rmb.HasValue ? item.amountval_rmb.Value + "" : "")+"|"+item.month);
             }
 
             var guid = Guid.NewGuid().ToString();
@@ -529,6 +529,34 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
 
         }
 
+        /// <summary>
+        /// 获取平台的站点
+        /// </summary>
+        /// <param name="platform"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public JsonResult ListWebsite(string platform)
+        {
+            if (string.IsNullOrEmpty(platform))
+            {
+                return Json(new { 
+                    success = false,
+                    msg = "请选择平台",
+                });
+            }
+
+            var listFeeCol = new Services.DataWareHouse.PlatformOrderFeeServices().ListOrderFeeCol();
+
+            var listWebsite = listFeeCol.Where(a => a.platform == platform).Where(a => !string.IsNullOrEmpty(a.website)).ToList();
+
+            return Json(new { 
+                success = true,
+                data = listWebsite.Select(a=>a.website).Distinct().ToList(),
+                msg = "",
+            });
+
+        }
+
         #endregion
 
         #region 私有方法

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

@@ -15,7 +15,7 @@
                 <div class="form-inline" style="line-height:40px;">
                     <div class="form-group">
                         <label>平台：</label>
-                        <select id="platform" name="platform" class="form-control" style="width:120px;">
+                        <select id="platform" name="platform" class="form-control" style="width:150px;">
                             @if (ViewBag.platform.Count > 0)
                             {
                                 foreach (var item in ViewBag.platform)
@@ -107,6 +107,11 @@
             $("#roletable").attr("data-height", (height - 170));
 
             list();
+
+            $('#platform').change(function () {
+                //获取平台站点
+                getWebsite();
+            })
         })
 
         function list() {
@@ -117,7 +122,11 @@
                 {
                     field: 'datatime', title: '账单时间', width: '160'
                 },
-                { field: 'orderno', title: '单号', width: '160' },
+                {
+                    field: 'orderno', title: '单号', width: '180', formatter: function (idx, data) {
+                        return '<div class="mules" title="' + data.orderno + '">' + data.orderno + '</div>';
+                    }
+                },
                 { field: 'feetype', title: '费用字段说明', width: '160' },
                 { field: 'financecategory', title: '财务分类归集说明', width: '180' },
                 { field: 'datacenter_col', title: '数据中心费用类型', width: '180'},
@@ -170,5 +179,28 @@
             }
         }
 
+        function getWebsite() {
+            $.submit({
+                url: '@Url.Content("~/DataWareHouse/PlatformOrder/ListWebsite?platform=")' + $('#platform').val(),
+                paramData: '',
+                type:'POST',
+                func: function (result) {
+                    $('#website').html('<option value="">请选择站点</option>');
+                    if (result.success) {
+                        if (result.data.length > 0) {
+                            for (var i in result.data) {
+                                $('#website').append('<option value="' + result.data[i] + '">' + result.data[i] + '</option>');
+                            }
+                        }
+
+                    }
+                    else {
+                        alert(result.msg);
+                    }
+
+                }
+            })
+        }
+
     </script>
 }

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

@@ -26,6 +26,7 @@
                             <option value="JD">JD</option>
                             <option value="Fyndiq">Fyndiq</option>
                             <option value="Paypal">Paypal</option>
+                            <option value="速卖通支付宝">支付宝</option>
                         </select>
                     </div>
                     <div class="form-group">