Merge remote-tracking branch 'origin/release-201824-wangcz' into release-201824-wangcz

src/main/java/com/uas/platform/b2c/logistics/dao/AddressDao.java

@@ -81,6 +81,6 @@ public interface AddressDao extends JpaSpecificationExecutor<Address>, JpaReposi
 	 * @param usetype      使用类型
 	 * @return Integer 返回地址总数
 	 */
-	@Query(value="select count(1) from Address a where a.useruu=:useruu and a.dissociative=:dissociative and a.type=:type and a.usetype =:usetype")
+	@Query(value="select count(1) from Address a where a.useruu=:useruu and a.type=:type and a.usetype =:usetype")
 	Integer getCountByUseruuAndTypeAndUsetype(@Param("useruu") Long useruu, @Param("type") int type, @Param("usetype") Short usetype);
 }

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

@@ -16,6 +16,7 @@ define(['app/app'], function(app) {
         $scope.param = {};
 
         $scope.tab = $stateParams.tab == 'accountTab' ? $stateParams.tab : hiStatus == null ? 'paymentRecord' : hiStatus;
+        console.log($stateParams, '$stateParams')
 
         document.title = $stateParams.tab == 'accountTab' ? '收款账户' : '应收对账' + '-优软商城';
 

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

@@ -481,8 +481,8 @@
 	<div class="pay_record oder">
 		<div class="oder01" style="margin-bottom: 16px;">
 			<ul>
-				<!--<li ng-class="{'active' : status=='pay-history'}" ng-click="toggleStatus('pay-history')"><a href="javascript:void(0)">交易记录</a></li>-->
-				<li class="active"><a href="javascript:void(0)">应付对账</a></li>
+				<li ng-if="status != 'pay-info'" ng-class="{'active' : status=='pay-history'}"><a href="javascript:void(0)">交易记录</a></li>
+				<li ng-if="status == 'pay-info'" ng-class="{'active' : status=='pay-info'}"><a href="javascript:void(0)">应付对账</a></li>
 			</ul>
 		</div>
 		<!--支付中心列表-->

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

@@ -677,10 +677,10 @@
 <div class="user_right fr" id="pay_center">
     <!--支付中心-->
     <div class="pay_record oder">
-      <div class="oder01">
+        <div class="oder01">
             <ul>
-                <!--<li ng-click="setTab('paymentRecord')" ng-class="{'active' : tab == 'paymentRecord'}"><a href="javascript:void(0)">交易记录</a></li>-->
-                <li ng-class="{'active' : tab == 'accountTab'}"><a href="javascript:void(0)">应收对账</a></li>
+                <li ng-if="tab != 'accountTab'" ng-class="{'active' : tab == 'paymentRecord'}"><a href="javascript:void(0)">交易记录</a></li>
+                <li ng-if="tab == 'accountTab'" ng-class="{'active' : tab == 'accountTab'}"><a href="javascript:void(0)">应收对账</a></li>
             </ul>
         </div>
         <!--支付中心列表-->
@@ -778,7 +778,7 @@
                         <span>收款成功</span>
                         <span ng-bind="record.transferTime | date : 'yyyy-MM-dd HH:mm:ss'">2017.01.18</span>
                     </dd>
-                    <div class="total" ng-if="bankTransRecore && bankTransRecore.length > 0">
+                    <!--<div class="total" ng-if="bankTransRecore && bankTransRecore.length > 0">-->
                      <!--   <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>
@@ -787,24 +787,24 @@
                         <b>|</b>
                         <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 class="fl">共计{{totalElements}}笔交易</div>
-                        <div class="fr">
-                            <p>已收总计：
-                                <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>
-                            </p>
-                            <p>结余：
-                                <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>
-                            </p>
-                        </div>
-                    </div>
+                        <!--<div class="fl">共计{{totalElements}}笔交易</div>-->
+                        <!--<div class="fr">-->
+                            <!--<p>已收总计：-->
+                                <!--<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>-->
+                            <!--</p>-->
+                            <!--<p>结余：-->
+                                <!--<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>-->
+                            <!--</p>-->
+                        <!--</div>-->
+                    <!--</div>-->
 
                     <dd ng-if="!bankTransRecore || bankTransRecore.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">
                         <div class="col-xs-offset-3 col-xs-2">

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

@@ -975,7 +975,7 @@
                                 <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
                                 <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
                             </div>
-                            <div class="date-bottom-item" ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></div>
+                            <div class="date-bottom-item" ng-bind="seek.reDate | date:'yyyy-MM-dd HH:mm'"></div>
                         </div>
                     </td>
                     <td>