Merge branch 'test6.9.3' of http://git.yoho.cn/ufo/ufo-platform into test6.9.3

@@ -111,7 +111,7 @@ public class SelfShelvesServiceImpl implements ISelfShelvesService {
     	}
     	 
     	int num = selfShelvesMapper.upadteAuditResult(req.getId(), req.getStatus());
-    	if(num > 0 && req.getStatus().intValue() == 3) {//上架成功，通知发布者站内信和短信“您提交的「品牌」「商品名称」「货号」信息已审核通过，赶紧发布您的好货吧”
+    	if(num > 0 && req.getStatus().intValue() == 1) {//上架成功，通知发布者站内信和短信“您提交的「品牌」「商品名称」「货号」信息已审核通过，赶紧发布您的好货吧”
     		//发送站内信
     		inboxService.addInboxForPlatform(pss.getUid(), InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_SELF_SHELVES_AUDIT_PASS.getType(), 
     				InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_SELF_SHELVES_AUDIT_PASS.getBusinessType(), buildParams(pss.getBrand(), pss.getProductName(), pss.getProductCode()));
@@ -147,11 +147,11 @@ public class SelfShelvesServiceImpl implements ISelfShelvesService {
     	if(status == 0) {
     		return "待审核";
     	}else if(status == 1) {
-    		return "待上架";
+    		return "已上架";
     	}else if(status == 2) {
     		return "不通过";
     	}else if(status == 3) {
-    		return "已上架";
+    		return "待上架";
     	}
     	return "";
     }

@@ -89,7 +89,7 @@ $(function() {
         text: "通过",
         iconCls: "icon-ok",
         onClick: function () {
-        	updateAudit(id, 1,);
+        	updateAudit(id,3);
         }
     });
 	

@@ -47,8 +47,9 @@ $(function() {
         editable : false,
         data: [
 			 {"text" : "待审核", "value" : 1},
-			 {"text" : "已通过", "value" : 2},
-			 {"text" : "不通过", "value" : 3}
+			 {"text" : "已上架", "value" : 2},
+			 {"text" : "不通过", "value" : 3},
+			 {"text" : "待上架", "value" : 4}
 		]
     });
 	
@@ -154,7 +155,7 @@ function loadMainList(){
                var str = "";
                if(rowData.status==0){
             	   str = "<a role='audit' dataId='"+ rowData.id +"' style='margin-left:10px;background-color: #5cb85c !important;'>审核</a>" + str;
-               }else if(rowData.status==1){
+               }else if(rowData.status==3){
             	   str = "<a role='upperShelf' dataId='"+ rowData.id +"' style='margin-left:10px;background-color: #428bca !important;'>上架</a>";
                }else{
             	   str = "<a role='detail' dataId='"+ rowData.id +"' style='margin-left:10px;background-color: #428bca !important;'>查看</a>";
@@ -186,7 +187,7 @@ function loadMainList(){
                	var id = $(this).attr("dataId");
             	$.post(contextPath + "/selfShelves/updateAuditInfoById", {
             		id : id,
-            		status : 3
+            		status : 1
                 }, function(data) {
                     if (data.code == 200) {
                     	document.getElementById("btnList").style.display= "none";