ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit 133bd20b6c5aa76267d231121b5644deae65f3a7 1 parent 0d180dd6

寄存

Inline Side-by-side
Showing 1 changed file with 8 additions and 6 deletions
@@ -2044,22 +2044,24 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon @@ -2044,22 +2044,24 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
2044 } 2044 }
2045 } 2045 }
2046 2046
  2047 + if(resp.getAttributes().equals(OrderAttributes.QUICK_DELIVER.getCode())) {//闪购
  2048 + resp.setPickAmount(resp.getDepositAmount());
  2049 + resp.setDepositAmount("0.00");
  2050 + return;
  2051 + }
  2052 +
2047 resp.setPickAmount("0.00"); 2053 resp.setPickAmount("0.00");
2048 StorageDeposit deposit = storageDepositMapper.selectByOrderCode(orderCode); 2054 StorageDeposit deposit = storageDepositMapper.selectByOrderCode(orderCode);
2049 if(null == deposit) { 2055 if(null == deposit) {
2050 return; 2056 return;
2051 } 2057 }
  2058 +
2052 DepositOrder depositOrder = depositOrderMapper.selectByDepositCode(deposit.getDepositCode()); 2059 DepositOrder depositOrder = depositOrderMapper.selectByDepositCode(deposit.getDepositCode());
2053 if(null == depositOrder) { 2060 if(null == depositOrder) {
2054 return; 2061 return;
2055 } 2062 }
2056 2063
2057 - resp.setPickAmount(null == depositOrder.getAmount() ? "-" : String.format("%.2f", depositOrder.getAmount().doubleValue()));  
2058 - if(resp.getAttributes().equals(OrderAttributes.QUICK_DELIVER.getCode())) {//闪购  
2059 - resp.setPickAmount(resp.getDepositAmount());  
2060 - resp.setDepositAmount("0.00");  
2061 - }  
2062 - 2064 + resp.setPickAmount(null == depositOrder.getAmount() ? "0.00" : String.format("%.2f", depositOrder.getAmount().doubleValue()));
2063 } 2065 }
2064 2066
2065 2067