Merge branch 'master-fix' into release

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/component/ProdCostCalculation.java

@@ -339,7 +339,7 @@ public class ProdCostCalculation {
             if (isRestCoupon) {
                 this.discountCalculation(prodParam, groupDto);
             }
-            if (StringUtils.isNotBlank(prodParam.getBoxGauge())) {
+                if (StringUtils.isNotBlank(prodParam.getBoxGauge())) {
                 String[] prodBox = prodParam.getBoxGauge().split("\\*");
                 if (prodBox.length == 3) {
                     String prodL = prodBox[0];
@@ -581,7 +581,7 @@ public class ProdCostCalculation {
     private void discountCalculation(ProdConditionParam prodParam,
                                      CouponAvailableGroupDto groupDto) {
         // 没有定价或者指定更新订单品名优惠，并且成交单价大于0时，去实时更新品名的优惠信息
-        if ((Objects.isNull(prodParam.getIsPriced()) || !prodParam.getIsPriced() || prodParam.getCalculationType() == 6) && !prodParam.getSplitCustomPriceType() && !prodParam.getSpecialPriceType() && !prodParam.getChannelManualPricing() && prodParam.getOneFreight().compareTo(BigDecimal.ZERO) > 0) {
+        if ((Objects.isNull(prodParam.getIsPriced()) || !prodParam.getIsPriced() || prodParam.getCalculationType() == 6 || prodParam.getCalculationType() == 7) && !prodParam.getSplitCustomPriceType() && !prodParam.getSpecialPriceType() && !prodParam.getChannelManualPricing() && prodParam.getOneFreight().compareTo(BigDecimal.ZERO) > 0) {
             BigDecimal orgFreightReduceAmount = BigDecimal.ZERO;
             BigDecimal orgClearanceReduceAmount = BigDecimal.ZERO;
             if (Objects.nonNull(groupDto) && CollectionUtil.isNotEmpty(groupDto.getCouponAvailableDtoList())) {
@@ -590,7 +590,7 @@ public class ProdCostCalculation {
                 BigDecimal freightReduceAmount = BigDecimal.ZERO;
                 BigDecimal clearanceReduceAmount = BigDecimal.ZERO;
                 List<CouponInfoVO> couponInfoVOList = new ArrayList<>();
-                if (Objects.nonNull(prodParam.getIsPriced()) && prodParam.getIsPriced() && prodParam.getCalculationType() == 6) {
+                if (Objects.nonNull(prodParam.getIsPriced()) && prodParam.getIsPriced() && (prodParam.getCalculationType() == 6 || prodParam.getCalculationType() == 7)) {
                     // 当是已定价的产品，并且执行活动优惠重算时，计算方式为 新成交单价=原成交单价+原优惠金额-当前优惠金额
                     orgFreightReduceAmount = prodParam.getDiscountFreightPrice();
                     orgClearanceReduceAmount = prodParam.getDiscountClearanceFeePrice();