Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java

@@ -103,7 +103,7 @@ public class CalculationCommonService {
         long amount = 0L;
         for (CartGoods.ComboxGoods choice : cartGoods.getProductGroupList()) {
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial mt = choices.get(choice.getGoodsId());
-            if (mt != null) {
+            if (mt == null) {
                 amount = choice.getAmount() * cartGoods.getQty();
             } else {
                 amount = mt.getRealAmount();