ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit c640d050dc845ab697b3dbf1d4a78194139ddc8e 1 parent 1eb1ec26

keep same as before when not wallet pay

Inline Side-by-side
Showing 1 changed file with 15 additions and 6 deletions
@@ -14,13 +14,22 @@ public interface AbsSellerOrderViewService { @@ -14,13 +14,22 @@ public interface AbsSellerOrderViewService {
14 14
15 default List<ButtonShowBo> getButtons(Integer storageNum, SellerType st, Integer payment, SkupStatus skupStatus){ 15 default List<ButtonShowBo> getButtons(Integer storageNum, SellerType st, Integer payment, SkupStatus skupStatus){
16 //异常扯淡，兼容老数据， 16 //异常扯淡，兼容老数据，
17 - boolean isEntry = (st == SellerType.ENTRY  
18 - && payment != null  
19 - && OrderCodeType.SELLER_RECHARGE_EARNEST_TYPE.getType() == payment) ;  
20 - SellerType lst = isEntry ? SellerType.ENTRY : SellerType.COMMON;  
21 - if (storageNum == 1 && isEntry){  
22 - lst = SellerType.ONE_PRD_ENTRY; 17 +
  18 + boolean isEntry = st == SellerType.ENTRY;
  19 + boolean isWalletPay = payment != null
  20 + && OrderCodeType.SELLER_RECHARGE_EARNEST_TYPE.getType() == payment ;
  21 + //非入驻商家 或者支付方式不是钱包的订单，均为原先方式
  22 + SellerType lst = SellerType.COMMON;
  23 + if(isEntry && isWalletPay){//入驻商家，订单是钱包方式支付
  24 + if(storageNum > 1){
  25 + lst = SellerType.ENTRY;
  26 + }
  27 +
  28 + if(storageNum == 1){
  29 + lst = SellerType.ONE_PRD_ENTRY;
  30 + }
23 } 31 }
  32 +
24 // 按钮显示 33 // 按钮显示
25 List<ButtonShowBo> buttons; 34 List<ButtonShowBo> buttons;
26 buttons = skupStatus.getListButtons(lst); 35 buttons = skupStatus.getListButtons(lst);