Merge branch 'dev_order' into test6.8.2

@@ -14,13 +14,22 @@ public interface AbsSellerOrderViewService {
 
     default List<ButtonShowBo> getButtons(Integer storageNum, SellerType st, Integer payment, SkupStatus skupStatus){
         //异常扯淡，兼容老数据，
-        boolean isEntry = (st == SellerType.ENTRY
-                && payment != null
-                && OrderCodeType.SELLER_RECHARGE_EARNEST_TYPE.getType() == payment) ;
-        SellerType lst = isEntry ? SellerType.ENTRY : SellerType.COMMON;
-        if (storageNum == 1 && isEntry){
+
+        boolean isEntry = st == SellerType.ENTRY;
+        boolean isWalletPay =  payment != null
+                && OrderCodeType.SELLER_RECHARGE_EARNEST_TYPE.getType() == payment ;
+        //非入驻商家 或者支付方式不是钱包的订单，均为原先方式
+        SellerType lst = SellerType.COMMON;
+        if(isEntry && isWalletPay){//入驻商家，订单是钱包方式支付
+            if(storageNum > 1){
+                lst = SellerType.ENTRY;
+            }
+
+            if(storageNum == 1){
                 lst = SellerType.ONE_PRD_ENTRY;
             }
+        }
+
         // 按钮显示
         List<ButtonShowBo> buttons;
         buttons = skupStatus.getListButtons(lst);