fix tips

chenchao
Commit 1bff9c0960d76dbfd5f91f4d9dd3711ba6725a5e 1 parent 4caeab92
Showing 1 changed file with 5 additions and 4 deletions
order/src/main/java/com/yohoufo/order/service/support/ShoppingSupport.java
--- a/order/src/main/java/com/yohoufo/order/service/support/ShoppingSupport.java
View file @1bff9c0
+++ b/order/src/main/java/com/yohoufo/order/service/support/ShoppingSupport.java
View file @1bff9c0
@@ -110,9 +110,9 @@ public class ShoppingSupport {
         if (Objects.nonNull(shipFeeDetail = chargeResult.getShipFeeDetail())){
             if (shipFeeDetail.getCutAmount()>0D){
                 expressFormula.setPromotionAside(OrderConstant.DELIVERY_DESC_ASIDE);
+                String normalShipFee = OrderConstant.PLUS_SIGN + MathUtils.formatCurrencyStr(shipFeeDetail.getAmount());
+                expressFormula.setNormalAmount(normalShipFee);
             }
-            String normalShipFee = OrderConstant.PLUS_SIGN + MathUtils.formatCurrencyStr(shipFeeDetail.getAmount());
-            expressFormula.setNormalAmount(normalShipFee);
             //
             shipFee = OrderConstant.PLUS_SIGN + MathUtils.formatCurrencyStr(shipFeeDetail.getFinalAmount());
         }else{
@@ -128,9 +128,10 @@ public class ShoppingSupport {
             tariffFormula.setPromotion(OrderConstant.TAX_DESC);
             if (tariffFee.getCutAmount()>0D){
                 tariffFormula.setPromotionAside(OrderConstant.TAX_DESC_ASIDE);
+                String tariffAmountDesc = OrderConstant.PLUS_SIGN + MathUtils.formatCurrencyStr(tariffAmount);
+                tariffFormula.setNormalAmount(tariffAmountDesc);
             }
-            String tariffAmountDesc = OrderConstant.PLUS_SIGN + MathUtils.formatCurrencyStr(tariffAmount);
-            tariffFormula.setNormalAmount(tariffAmountDesc);
+
             //
             String finalTariffAmountDesc = OrderConstant.PLUS_SIGN + MathUtils.formatCurrencyStr(tariffFee.getFinalAmount());
             tariffFormula.setPromotionAmount(finalTariffAmountDesc);