Merge branch 'feature/xukang_20200601_麦咖啡P7V1' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/FreightCalculation.java

@@ -35,13 +35,13 @@ public class FreightCalculation {
                 }
                 ActivityList activityList = new ActivityList();
                 activityList.setTipType(activityPrompt.getActivityType());
-                activityList.setSatisfy(MoneyUtils.parseFen2Yuan(activityPrompt.getAlreadyDiscountThresholdAmount()));
-                activityList.setAlreadyDecut(MoneyUtils.parseFen2Yuan(activityPrompt.getAlreadyDiscountAmount()));
-                activityList.setDeduct(MoneyUtils.parseFen2Yuan(activityPrompt.getAlreadyDiscountAmount()));
-                activityList.setAgianDeduct(MoneyUtils.parseFen2Yuan(activityPrompt.getDiscountAmout() - activityPrompt.getAlreadyDiscountAmount()));
+                activityList.setSatisfy(MoneyUtils.parseFen2YuanInt(activityPrompt.getAlreadyDiscountThresholdAmount()));
+                activityList.setAlreadyDecut(MoneyUtils.parseFen2YuanInt(activityPrompt.getAlreadyDiscountAmount()));
+                activityList.setDeduct(MoneyUtils.parseFen2YuanInt(activityPrompt.getAlreadyDiscountAmount()));
+                activityList.setAgianDeduct(MoneyUtils.parseFen2YuanInt(activityPrompt.getDiscountAmout() - activityPrompt.getAlreadyDiscountAmount()));
                 if(activityPrompt.getThresholdAmount() > activityPrompt.getTotalAmount()) {
-                    activityList.setMissing(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
-                    activityList.setAgainBuy(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
+                    activityList.setMissing(MoneyUtils.parseFen2YuanInt(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
+                    activityList.setAgainBuy(MoneyUtils.parseFen2YuanInt(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
                 } else {
                     activityList.setMissing("0");
                     activityList.setAgainBuy("0");

shopping-cart-application-service/src/main/java/cn/freemud/utils/MoneyUtils.java

@@ -17,4 +17,18 @@ public class MoneyUtils {
         }
         return new BigDecimal(fen).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString();
     }
+
+    public static String parseFen2YuanInt(Long fen) {
+        if(null == fen) {
+            return "0";
+        }
+        return new BigDecimal(fen).divide(new BigDecimal(100), 0, BigDecimal.ROUND_HALF_UP).toPlainString();
+    }
+
+    public static String parseFen2YuanInt(Integer fen) {
+        if(null == fen) {
+            return "0";
+        }
+        return new BigDecimal(fen).divide(new BigDecimal(100), 0, BigDecimal.ROUND_HALF_UP).toPlainString();
+    }
 }