卖家结算中心调整

src/main/java/com/uas/platform/b2c/fa/payment/model/BankTransfer.java

@@ -48,6 +48,18 @@ public class BankTransfer {
 	@Column(name = "banktf_collectuu")
 	private Long collectUseruu;
 
+	/**
+	 * 买家名称
+	 */
+	@Column(name = "banktf_buyername")
+	private String buyername;
+
+	/**
+	 * 买家企业名称
+	 */
+	@Column(name = "banktf_entername")
+	private String buyerentername;
+
 	/**
 	 * 付款方个人uu
 	 */

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_pay_ctrl.js

@@ -242,22 +242,6 @@ define(['app/app'], function(app) {
 			exportByAjax();
 		};
 
-		if ($scope.keyword && $scope.keyword.length > 0){
-			param.keyword = $scope.keyword;
-		}
-		if ($scope.currency && $scope.currency != 'ALL'){
-			param.currencyName = $scope.currency;
-		}
-		if ($scope.paytype && $scope.paytype != 'ALL'){
-			param.method = $scope.paytype;
-		}
-		if ($scope.startDate){
-			param.fromDate = $scope.startDate.getTime();
-		}
-		if ($scope.endDate){
-			param.toDate = $scope.endDate.getTime();
-		}
-
 		var exportByAjax = function () {
 			var url = 'trade/order/export/payRecord';
 			var strArray = [];

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_pay_ctrl.js

@@ -104,6 +104,30 @@ define(['app/app'], function(app) {
             }
         };
 
+        $scope.condition = {
+            startDateOpen: false,
+            endDateOpen: false
+        };
+
+        // 打开日期选择框
+        $scope.openDatePicker = function($event, item, openParam, status) {
+            if (status != null) {
+                if (status == 1) {
+                    if ($scope.startDate != null) {
+                        return;
+                    }
+                }
+                if (status == 2) {
+                    if ($scope.endDate != null) {
+                        return;
+                    }
+                }
+            }
+            $event.preventDefault();
+            $event.stopPropagation();
+            item[openParam] = !item[openParam];
+        };
+
         // 文件上传成功之后
         $scope.uploadChange = function(){
             var fileName = $scope.account.files[0].name;

src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -573,7 +573,7 @@
                             <div class="data-input">
                                 <input type="text" ng-model="startDate"
                                        class="form-control select-adder" placeholder="起始时间"
-                                       datepicker-popup="yyyy-MM-dd HH:mm:ss"
+                                       datepicker-popup="yyyy-MM-dd"
                                        is-open="condition.startDateOpen"
                                        max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
                                        datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
@@ -586,7 +586,7 @@
                             <div class="data-input">
                                 <input type="text" ng-model="endDate"
                                        class="form-control select-adder" placeholder="结束时间"
-                                       datepicker-popup="yyyy-MM-dd HH:mm:ss"
+                                       datepicker-popup="yyyy-MM-dd"
                                        is-open="condition.endDateOpen"
                                        min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
                                        datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
@@ -598,7 +598,7 @@
                         <div class="sreach-input fr">
                             <input type="search" placeholder="商家名称/订单号" class="form-control" ng-model="keyword" ng-search="search()"/>
                             <a class="seek" href="javascript:void(0)" ng-click="search()">搜索</a>
-                            <a class="seek" href="javascript:void(0)" style="margin-left: 5px;">导出</a>
+                            <a class="seek" href="javascript:void(0)" ng-click="exportToExcel()" style="margin-left: 5px;">导出</a>
                         </div>
                     </div>
                 </div>
@@ -611,39 +611,39 @@
                         <span>币种</span>
                         <span>金额</span>
                         <span>
-							<select class="form-control select-adder" style="width: 90px">
-								<option>交易方式</option>
-								<option value="1">RMB</option>
-								<option value="2">USD</option>
+							<select class="form-control select-adder" style="width: 90px" ng-model="paytype" ng-change="filterLoad()">
+								<option value="ALL">交易方式</option>
+								<option value="1102">线上支付</option>
+								<option value="1103">线下支付</option>
 							</select>
 						</span>
                         <span>
-							<select class="form-control select-adder">
+							<select class="form-control select-adder" style="width: 90px">
 								<option>状态</option>
-								<option value="1">RMB</option>
-								<option value="2">USD</option>
+								<option value="1">收款成功</option>
 							</select>
 						</span>
                     </dt>
-                    <dd>
-                        <span>2017.01.18</span>
-                        <span>20170116001</span>
-                        <span>￥8888.52</span>
-                        <span>支付宝</span>
+                    <dd ng-repeat="record in bankTransRecore">
+                        <span ng-bind="record.transferTime | date : 'yyyy-MM-dd HH:mm:ss'">2017.01.18</span>
+                        <span ng-bind="record.bankTransAssociate.btaTableserNum">20170116001</span>
+                        <span>优软科技</span>
+                        <span ng-bind="record.currencyName">RMB</span>
                         <span>
                             <i class="fa fa-plus" style="color:#f51c24"></i>
-                            <i class="fa fa-minus" style="color:#1da902"></i>
-                            12345678909</span>
-                        <span>退款成功</span>
-                        <span>退款成功</span>
+                            <!--<i class="fa fa-minus" style="color:#1da902"></i>-->
+                            {{record.total}}</span>
+                        <span>线上付款</span>
+                        <span>收款成功</span>
                     </dd>
+
                     <div class="total">
                         <span>收入总计&nbsp;  <em>111111112</em></span><b>|</b>
                         <span>支出总计&nbsp;  <em>2222222222</em></span><b>|</b>
                         <span>结余&nbsp;<em>(共计5笔交易)</em></span>
                     </div>
 
-                    <dd ng-if="!tradeRecordPage.content || tradeRecordPage.content.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">
+                    <dd ng-if="!bankTransRecore || bankTransRecore.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">
                         <div class="col-xs-offset-3 col-xs-2">
                             <img src="static/img/all/empty-cart.png">
                         </div>
@@ -699,9 +699,15 @@
                         <td ng-bind="account.branchname">南山支行</td>
                         <td ng-bind="account.number | hideBankFilter">1256325*******************5621</td>
                         <td ng-bind="account.accountname">优软*********有限公司</td>
-                        <td ng-bind="account.status | bankStatusFilter"> <i class="fa fa-exclamation-circle" style="position:relative;"><span style="display:block;width:130px;padding:5px;font-size: 12px;line-height:15px;color:#666;position:absolute;top:0px;left:20px;background: #fff;border:1px solid #89aefa;">审核通过后，原账户将自动失效</span></i>状态</td>
+                        <td ng-bind="account.status | bankStatusFilter">待审核
+                            <i class="fa fa-exclamation-circle" style="position:relative;">
+                                <span style="display:block;width:130px;padding:5px;font-size: 12px;line-height:15px;color:#666;position:absolute;top:0px;left:20px;background: #fff;border:1px solid #89aefa;">
+                                    审核通过后，原账户将自动失效
+                                </span>
+                            </i>
+                        </td>
                         <td class="operate-area">
-                            <span>重新使用</span>
+                            <span ng-if="account.status == 105">重新使用</span>
                             <span ng-click="deleteAccount(account)">删除</span>
                         </td>
                     </tr>