买卖家支付结算中心调整

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

@@ -66,9 +66,15 @@ public class BankTransfer {
 	/**
 	 * 订单号
 	 */
-	@Column(name = "banktf_orid")
+	@Column(name = "pu")
 	private String orderid;
 
+	/**
+	 * 采购单号
+	 */
+	@Column(name = "bankty_puid")
+	private String puid;
+
 	/**
 	 * 付款方个人uu
 	 */
@@ -156,6 +162,14 @@ public class BankTransfer {
 		this.orderid = orderid;
 	}
 
+	public String getPuid() {
+		return puid;
+	}
+
+	public void setPuid(String puid) {
+		this.puid = puid;
+	}
+
 	public String getJsonPament() {
 		return jsonPament;
 	}

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankInfoServiceImpl.java

@@ -215,8 +215,7 @@ public class BankInfoServiceImpl implements BankInfoService {
 
 	@Override
 	public List<BankInfo> findBankInfoByUseruu(Long useruu, Long enuu, Integer opraterUserType) {
-//		return bankInfoDao.findByUseruuAndEnuuAndTypeAndOpraterUserTypeAndStatusOrderByNumAsc(useruu, enuu, (short)1, opraterUserType, Status.ALLOW.value());
-		return null;
+		return bankInfoDao.findByUseruuAndEnuuAndOpraterUserTypeAndStatusOrderByNumAsc(useruu, enuu, opraterUserType, Status.ALLOW.value());
 	}
 
 	@Override

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankTransferServiceImpl.java

@@ -495,7 +495,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 			info.filter("operateType", type);
 			info.filter("collectenuu", SystemSession.getUser().getEnterprise().getUu());
 		}
-		info.sorting("transferTime", Sort.Direction.DESC);
+		info.sorting(Sort.Direction.DESC, "transferTime");
 		filterPageInfo(info, keyword, fromDate, toDate);
 		List<BankTransfer> list = bankTransferDao.findAll(new Specification<BankTransfer>() {
 			@Override

src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/SettlementServiceImpl.java

@@ -487,6 +487,8 @@ public class SettlementServiceImpl implements SettlementService {
 			transfer.setBuyername(purchase.getBuyername());
 			transfer.setBuyerentername(purchase.getBuyentername());
 			transfer.setOrderid(purchase.getOrderid());
+			transfer.setPuid(purchase.getPurchaseid());
+
 			//收方和付方的账户信息
 			transfer.setJsonPament(bankTransfer.getJsonPament());
 			transfer.setJsonReceive(bankTransfer.getJsonReceive());

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

@@ -511,6 +511,12 @@ define(['app/app'], function(app) {
 		// 	}
 		// };
 
+		$scope.showList = function () {
+			$scope.showBankFrame = !$scope.showBankFrame;
+			$scope.matchData = true;
+			$scope.resultList = $scope.bankList;
+		};
+
 		$scope.inputBankName = function () {
 			$scope.showBankFrame = true;
 		};

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

@@ -14,7 +14,7 @@ define(['app/app'], function(app) {
 
         $scope.$payCenter = {};
         $scope.param = {};
-        $scope.$payCenter.tab = "paymentRecord";
+        $scope.tab = "paymentRecord";
         $scope.$$bankInfo = {};
 
         $scope.paytype = 'ALL';
@@ -42,6 +42,9 @@ define(['app/app'], function(app) {
                 bankTransferService.getVendorBankTransferByMall(param, function (page) {
                     if(page.code == 1) {
                         $scope.bankTransRecore = page.data.data.content;
+                        if ($scope.bankTransRecore.length > 0){
+                            $scope.currencySymbol = $scope.bankTransRecore[0].currencyName;
+                        }
                         var pageObject = page.data.data;
                         $scope.totalPrice = page.data.total;
                         angular.forEach($scope.bankTransRecode, function (bankT) {
@@ -68,10 +71,6 @@ define(['app/app'], function(app) {
             }
         });
 
-        $scope.fitKeyWord = function (item) {
-            $scope.keyword = item;
-        };
-
         $scope.bankInfoTableParams = new ngTableParams({
             page : 1,
             count : 10,
@@ -117,7 +116,7 @@ define(['app/app'], function(app) {
 
         //获取数据的方法。
         var loadData = function() {
-            switch ($scope.$payCenter.tab) {
+            switch ($scope.tab) {
                 case 'paymentRecord' :
                     loadHistory();
                     break;
@@ -130,8 +129,8 @@ define(['app/app'], function(app) {
 
         //切换tab方法
         $scope.setTab = function (tab) {
-            if($scope.$payCenter.tab !== tab) {
-                $scope.$payCenter.tab = tab;
+            if($scope.tab !== tab) {
+                $scope.tab = tab;
                 loadData();
             }
         };
@@ -160,6 +159,11 @@ define(['app/app'], function(app) {
             item[openParam] = !item[openParam];
         };
 
+        $scope.onDateCondition = function () {
+            console.log($scope.startDate);
+            console.log($scope.endDate);
+        };
+
         // 文件上传成功之后
         $scope.uploadChange = function(){
             var fileName = $scope.account.files[0].name;

src/main/webapp/resources/view/common/bankInfoModal.html

@@ -80,7 +80,7 @@
 						<!--<option value="2">2</option>-->
 					<!--</select>-->
 		    		<input name="bankname" ng-model="account.bankname" ng-change="checkAccount(1)" type="text" class="form-control" placeholder="请选择开户银行" required style="width:216px;border-right:transparent;border-radius:3px 0 0 3px;">
-					<i class="select-adder" style="display:inline-block;width:25px;height:34px;border:1px solid #ddd;position:absolute;right:-25px;top:0;border-radius:0 3px 3px 0;border-left:transparent"></i>
+					<i class="select-adder" style="display:inline-block;width:25px;height:34px;border:1px solid #ddd;position:absolute;right:-25px;top:0;border-radius:0 3px 3px 0;border-left:transparent" ng-click="showList()"></i>
 					<ul class="select-down" ng-if="showBankFrame && matchData">
 						<li ng-click="fitBankToAccount(bank)" ng-repeat="bank in resultList">{{bank}}</li>
 					</ul>

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

@@ -388,7 +388,7 @@
 						<span>新增账户</span>
 					</div>
 				</div>
-				<table class="user-account-table">
+				<table class="user-account-table" ng-table="bankInfoTableParams">
 					<thead>
 						<th width="165">开户银行</th>
 						<th width="209">开户支行</th>
@@ -493,7 +493,11 @@
 						<span><a ng-bind="tradeRecord.orderid" ng-href="user#/order/detail/{{tradeRecord.orderid | EncryptionFilter}}">20170116001</a></span>
 						<span ng-bind="tradeRecord.sellername">优软科技</span>
 						<span ng-bind="tradeRecord.currencyName"></span>
-						<span ng-bind="tradeRecord.ensurePrice | formateNumber : 2 | currencySysmbol : tradeRecord.currencyName"></span>
+						<span >
+							<!--<i class="fa fa-plus" style="color:#f51c24"></i>-->
+							<i class="fa fa-minus" style="color:#1da902"></i>
+                            <em style="color: #323232;" ng-bind="tradeRecord.ensurePrice | formateNumber : 2"></em></span>
+						</span>
 						<span>
 							<b ng-if="tradeRecord.paytype == 1102">线上支付</b>
 							<b ng-if="tradeRecord.paytype == 1103">线下支付</b>

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

@@ -488,34 +488,35 @@
     .ticket_record_list{
         background: none;
     }
-    .ticket_record_list .total{
+    .pay_record .ticket_record_list .total{
         width:98%;
         height:39px;
         background: #e6eefe;
         display:inline-flex;
-        justify-content: center;
+        justify-content: space-around;
         align-items: center;
         margin:0 10px;
     }
-    .ticket_record_list .total span{
-        width:33%
+    .pay_record .ticket_record_list dl div.total>span{
+        width:200px;
     }
-    .ticket_record_list .total span:nth-child(1) em{
+    .pay_record .ticket_record_list dl div.total>span:nth-child(1) em{
         color:#f51c24;
     }
-    .ticket_record_list .total span:nth-child(3) em{
+    .pay_record .ticket_record_list dl div.total>span:nth-child(3) em{
         color:#1da902;
     }
-    .ticket_record_list .total span:last-child{
+    .pay_record .ticket_record_list dl div.total>span:last-child{
         font-weight:bold;
     }
-    .ticket_record_list .total span:last-child em{
+    .pay_record .ticket_record_list dl div.total>span:last-child em{
         font-size:12px;
     }
-    .ticket_record_list .total>b{
+    .pay_record .ticket_record_list dl div.total>b{
         color:#abc4f7;
     }
 
+
     #pay_center .tab .tab-header {
         width: 999px;
         margin: 0 auto;
@@ -606,14 +607,14 @@
     <div class="pay_record oder">
         <div class="oder01">
             <ul>
-                <li ng-click="setTab('paymentRecord')" ng-class="{'active' : $payCenter.tab == 'paymentRecord'}"><a href="javascript:void(0)">交易记录</a></li>
-                <li ng-click="setTab('accountTab')" ng-class="{'active' : $payCenter.tab == 'accountTab'}"><a href="javascript:void(0)">收款帐户</a></li>
+                <li ng-click="setTab('paymentRecord')" ng-class="{'active' : tab == 'paymentRecord'}"><a href="javascript:void(0)">交易记录</a></li>
+                <li ng-click="setTab('accountTab')" ng-class="{'active' : tab == 'accountTab'}"><a href="javascript:void(0)">收款帐户</a></li>
             </ul>
         </div>
         <!--支付中心列表-->
         <div class="ticket_record_list">
             <!-- 交易记录-->
-            <div class="tab" ng-if="$payCenter.tab == 'paymentRecord'" style="display: inline-block">
+            <div class="tab" ng-show="tab == 'paymentRecord'" style="display: inline-block">
                 <!--搜索时间筛选-->
                 <div class="screen" style="background: #f5f8fe;height: 40px;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">
                     <div class="sreach fr">
@@ -644,7 +645,7 @@
                             </div>
                         </div>
                         <div class="sreach-input fr">
-                            <input type="search" placeholder="商家名称/订单号" class="form-control" ng-model="keyword" ng-change="fitKeyWord(keyword)" ng-search="search()"/>
+                            <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;" ng-click="exportToExcel()">导出</a>
                         </div>
@@ -661,21 +662,19 @@
                         <span>
 							<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>
                         <span style="width:13.52%">
-							<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 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.orderid">20170116001</span>
+                        <span><a style="color: #666;" ng-bind="record.orderid" ng-href="vendor#/purchase/detail/{{record.puid | EncryptionFilter}}">20170116001</a></span>
                         <span ng-bind="record.buyerentername || record.buyername">优软科技</span>
                         <span ng-bind="record.currencyName">RMB</span>
                         <span>
@@ -686,11 +685,14 @@
                         <span>收款成功</span>
                     </dd>
                     <div class="total" ng-if="bankTransRecore && bankTransRecore.length > 0">
-                        <span>收入总计&nbsp;  <em></em><em ng-bind="totalPrice"></em></span>
+                        <span>收入总计&nbsp;  <em><i class="fa fa-yen" ng-if="currencySymbol.indexOf('RMB') > -1"></i>
+                            <i class="fa fa-usd" ng-if="currencySymbol.indexOf('USD') > -1"></i>{{totalPrice}}</em></span>
                         <b>|</b>
-                        <span>支出总计&nbsp;  <em>0</em></span>
+                        <span>支出总计&nbsp;  <em><i class="fa fa-yen" ng-if="currencySymbol.indexOf('RMB') > -1"></i>
+                            <i class="fa fa-usd" ng-if="currencySymbol.indexOf('USD') > -1"></i>0</em></span>
                         <b>|</b>
-                        <span>结余&nbsp;<em>{{totalPrice}}(共计{{totalElements}}笔交易)</em></span>
+                        <span>结余&nbsp;<em><i class="fa fa-yen" ng-if="currencySymbol.indexOf('RMB') > -1"></i>
+                            <i class="fa fa-usd" ng-if="currencySymbol.indexOf('USD') > -1"></i>{{totalPrice}}(共计{{totalElements}}笔交易)</em></span>
                     </div>
 
                     <dd ng-if="!bankTransRecore || bankTransRecore.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">
@@ -724,7 +726,7 @@
                 </div>
             </div>
             <!-- 收款账户-->
-            <div class="tab" ng-if="$payCenter.tab == 'accountTab'" style="display: inline-block;">
+            <div class="tab" ng-show="tab == 'accountTab'" style="display: inline-block;">
                 <div class="tab-header">
                     <span>已设置的账户信息</span>
                     <div ng-click="newAccount()">
@@ -759,22 +761,22 @@
 
                         </td>
                         <td class="operate-area">
-                            <span><a href="#" ng-if="account.status == 105">重新使用 |</a></span>
+                            <span><a ng-click="reuseAccount(account)" ng-if="account.status == 105">重新使用 |</a></span>
                             <span ng-click="deleteAccount(account)"><a href="#">删除</a></span>
                         </td>
                     </tr>
                 </table>
                 <p style="text-align:right;margin-right:28px;margin-top:-25px;">显示{{$$bankInfo.start}}-{{$$bankInfo.end}} 条，共 {{$$bankInfo.totalElements}}条</p>
-                <div class="com-del-box" ng-if="false">
+                <div class="com-del-box" ng-if="showReuseFrame">
                     <div class="title">
-                        <i></i>
+                        <a ng-click="cancelReuse()"><i class="fa fa-close fa-lg"></i></a>
                     </div>
                     <div class="content">
                         <!--<p><i class="fa fa-exclamation-circle"></i>是否要删除此账户信息?</p>-->
                         <p style="width:80%;line-height:20px;margin: 15px;margin-left: 30px;"><i class="fa fa-exclamation-circle"></i>此操作会让使用中的收款账户失效，是否确定重新使用？</p>
                         <div>
-                            <a>取消</a>
-                            <a>确认</a>
+                            <a ng-click="cancelReuse()">取消</a>
+                            <a ng-click="ensureReuse()">确认</a>
                         </div>
                     </div>
                 </div>
@@ -868,11 +870,11 @@
 <!--删除账户操作-->
 <div class="com-del-box" ng-if="$payCenter.deleteDiv">
     <div class="title">
-        <a ng-click="cancleDelete()"><i class="fa fa-close fa-lg"></i></a>
+        <a ng-click="cancelDelete()"><i class="fa fa-close fa-lg"></i></a>
     </div>
     <div class="content">
         <p><i class="fa fa-exclamation-circle"></i>删除此账户信息</p>
-        <div><a ng-click="cancleDelete()">取消</a><a ng-click="confirmDelete()">确认</a></div>
+        <div><a ng-click="cancelDelete()">取消</a><a ng-click="confirmDelete()">确认</a></div>
     </div>
 </div>
 <style>