Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'master' of…

Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

shopping-cart-application-service/src/main/java/cn/freemud/handle/CommonFunctionHandle.java

@@ -54,7 +54,7 @@ public class CommonFunctionHandle {
             collectTypes.sort((p1, p2) -> p2.getOrderAmount() - p1.getOrderAmount());
             newPackAmount = 0L;
             for (PackAmountConfig.CollectType collectType: collectTypes){
-                if(totalAmount > collectType.getOrderAmount()){
+                if(totalAmount >= collectType.getOrderAmount()){
                     newPackAmount = collectType.getFee().longValue();
                     break;
                 }