问题修复

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

@@ -8,6 +8,7 @@ import cn.freemud.entities.vo.ActivityTip;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.utils.MoneyUtils;
 import com.google.common.base.Functions;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,10 +43,10 @@ public class BuySendCalculation {
                 }
                 ActivityList activityList = new ActivityList();
                 activityList.setTipType(activityPrompt.getActivityType());
-                activityList.setSatisfy(activityPrompt.getThresholdAmount().toString());
+                activityList.setSatisfy(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount()));
                 if(activityPrompt.getThresholdAmount() > activityPrompt.getTotalAmount()) {
-                    activityList.setMissing(String.valueOf(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
-                    activityList.setAgainBuy(String.valueOf(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
+                    activityList.setMissing(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
+                    activityList.setAgainBuy(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
                 }
                 if(CollectionUtils.isNotEmpty(activityPrompt.getSendGoods())) {
                     if (CollectionUtils.isEmpty(cartSendGoodsList)) {

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

@@ -121,12 +121,14 @@ public class CalculationServiceImpl {
         setMealCalculation.updateShoppingCartGoodsDiscount(calculationDiscount,cartGoodsList,shoppingCartGoodsResponseVo);
 
         //加料
-        materialCalculation.updateShoppingCartGoodsApportion(calculationDiscount,cartGoodsList);
+//        materialCalculation.updateShoppingCartGoodsApportion(calculationDiscount,cartGoodsList);
 
-        //买赠
-        buySendCalculation.updateBuySendActivityTip(calculationDiscount, shoppingCartGoodsResponseVo, cartSendGoodsList);
-        //运费
-        freightCalculation.updateBuySendActivityTip(calculationDiscount, shoppingCartGoodsResponseVo);
+        if(null != calculationDiscount) {
+            //买赠
+            buySendCalculation.updateBuySendActivityTip(calculationDiscount, shoppingCartGoodsResponseVo, cartSendGoodsList);
+            //运费
+            freightCalculation.updateBuySendActivityTip(calculationDiscount, shoppingCartGoodsResponseVo);
+        }
         return calculationDiscount;
     }
 

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

@@ -6,6 +6,7 @@ import cn.freemud.entities.vo.ActivityTip;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.utils.MoneyUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
@@ -31,13 +32,13 @@ public class FreightCalculation {
                 }
                 ActivityList activityList = new ActivityList();
                 activityList.setTipType(activityPrompt.getActivityType());
-                activityList.setSatisfy(activityPrompt.getThresholdAmount().toString());
-                activityList.setAlreadyDecut(activityPrompt.getAlreadyDiscountAmount().toString());
-                activityList.setDeduct(activityPrompt.getAlreadyDiscountAmount().toString());
-                activityList.setAgianDeduct(String.valueOf(activityPrompt.getDiscountAmout() - activityPrompt.getAlreadyDiscountAmount()));
+                activityList.setSatisfy(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount()));
+                activityList.setAlreadyDecut(MoneyUtils.parseFen2Yuan(activityPrompt.getAlreadyDiscountAmount()));
+                activityList.setDeduct(MoneyUtils.parseFen2Yuan(activityPrompt.getAlreadyDiscountAmount()));
+                activityList.setAgianDeduct(MoneyUtils.parseFen2Yuan(activityPrompt.getDiscountAmout() - activityPrompt.getAlreadyDiscountAmount()));
                 if(activityPrompt.getThresholdAmount() > activityPrompt.getTotalAmount()) {
-                    activityList.setMissing(String.valueOf(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
-                    activityList.setAgainBuy(String.valueOf(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
+                    activityList.setMissing(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
+                    activityList.setAgainBuy(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()));
                 }
                 activityTip.getActivityList().add(activityList);
             }

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

+package cn.freemud.utils;
+
+import java.math.BigDecimal;
+
+public class MoneyUtils {
+
+    public static String parseFen2Yuan(Long fen) {
+        return new BigDecimal(fen).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString();
+    }
+}