Merge branch 'dev_order' into test6.8.2

@@ -40,17 +40,17 @@ public class SellerWalletDetail {
     	// 61退还保证金（退出商家）
     	RE_CHARGE("充值保证金", 1), 
     	PUBLISH("卖家发布商品", 11),
-    	ADD_PRICE("卖家调高商品价格", 11),
-    	SUBTRACT_PRICE("卖家调低商品价格", 11),
-    	SELLER_OFF("卖家下架商品", 11),
-    	SYSTEM_OFF("系统下架商品", 11),
-    	SELLER_CANCEL("卖家不卖了", 11),
-    	SELLER_OVER_TIME("卖家发货超时", 11),
-    	APPRAISE_FAIL("鉴定不通过", 11),
-    	BUYER_CANCEL_NO_DELIVERY("买家取消（无物流）", 11),
-    	BUYER_CANCEL_DELIVERY("买家取消（有物流）", 11),
-    	APPRAISE_OK("鉴定通过", 11),
-    	MERCHANT_EXIT("商家退出入驻", 11);
+    	ADD_PRICE("卖家调高商品价格", 12),
+    	SUBTRACT_PRICE("卖家调低商品价格", 13),
+    	SELLER_OFF("卖家下架商品", 21),
+    	SYSTEM_OFF("系统下架商品", 22),
+    	SELLER_CANCEL("卖家不卖了", 31),
+    	SELLER_OVER_TIME("卖家发货超时", 32),
+    	APPRAISE_FAIL("鉴定不通过", 33),
+    	BUYER_CANCEL_NO_DELIVERY("买家取消（无物流）", 41),
+    	BUYER_CANCEL_DELIVERY("买家取消（有物流）", 42),
+    	APPRAISE_OK("鉴定通过", 51),
+    	MERCHANT_EXIT("商家退出入驻", 61);
     	
     	private String name;
     	private int value;