Merge remote-tracking branch 'origin/feature-201815-liusw' into feature-201815-liusw

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -123,6 +123,7 @@ public class GoodsServiceImpl implements GoodsService {
 
     private final KindService kindService;
     private final StoreInDao storeInDao;
+    private static final int GOOD_SOLD_OUT = 602;
 
     private final StoreInService storeInService;
     /**
@@ -2556,6 +2557,7 @@ public class GoodsServiceImpl implements GoodsService {
         pageInfo.expression(PredicateUtils.or(new SimpleExpression[]{PredicateUtils.eq("status", 601, true), PredicateUtils.eq("status", 602, true)}));
         pageInfo.sorting(Sort.Direction.DESC, "updateDate");
         pageInfo.expression(PredicateUtils.eq("storeid", storeid, false));
+        pageInfo.expression(PredicateUtils.ne("go_status",GOOD_SOLD_OUT,false));
         if (StringUtils.hasText(kindUuid)) {
             // 如果包含多个叶子类目ID，则获取所有的叶子类目对应的商品信息
             if ("其他".equals(kindUuid) || "-10".equals(kindUuid)) {

src/main/webapp/resources/view/sso/left_nav.html

@@ -47,7 +47,7 @@
 		<li ng-class="{'active' : active == 'sso_security'}"><span ui-sref="ssoSecurity">安全设置</span></li>
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_management'}"><span ui-sref="ssoManagement">员工管理</span></li>
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_permission'}"><span ui-sref="ssoPermission">角色权限</span></li>
-		<li ng-if="isAdmin" ng-class="{'active' : active == 'sso_apply'}"><span ui-sref="ssoApplyBind">申请绑定</span></li>
+		<li ng-if="isAdmin" ng-class="{'active' : active == 'sso_apply'}"><span ui-sref="ssoApplyBind">绑定审核</span></li>
 		<li ng-class="{'active' : active == 'sso_address'}"><span ui-sref="ssoAddress">收货地址</span></li>
 		<!--<li ng-class="{'active' : active == 'vendor_logistics'}">-->
 			<!--<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>-->

src/main/webapp/resources/view/sso/ssoApplyBind.html

@@ -905,7 +905,7 @@
 <!--右侧主体部分-->
 <div class="count user_right fr" ng-click="hideList()">
       <!--申请绑定-->
-    <div class="rt_menu"><span>申请绑定</span></div>
+    <div class="rt_menu"><span>绑定审核</span></div>
     <div class="clearfix bind-en">
           <div class="rt_menu">
               <span class="pull-right"><input type="text" ng-model="searchParams.keyword" class="form-control" placeholder="用户名/UU账号/手机号"/><button class="btn" ng-click="searchApply()">搜索</button> </span></span>