bugfix

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -506,7 +506,7 @@ public class SubmitServiceImpl implements SubmitService {
                     product.setAddedValueTax(0d);
                     product.setTotalAddedValueTax(0d);
                 } else {
-                    // 获取商品购买价格(超级会员优惠商品价格>>>活动价格>>>阶梯价格>>>复购价格库>>>商品原始价)
+                    // 不是赠品，获取商品购买价格(超级会员优惠商品价格>>>活动价格>>>阶梯价格>>>复购价格库>>>商品原始价)
                     Double productPrice = product.getPrice();
                     Double discountPrice = product.getPrice();
                     // 商品税费
@@ -523,6 +523,7 @@ public class SubmitServiceImpl implements SubmitService {
                         promotions = null;
                     }
                     // 计算单价
+                    // 超级会员单价折扣计算
                     if (null != svipProductPo && 1 == svipProductPo.getSvipProductFlag()) {
                         // 超级会员优惠商品,不参与促销活动（普通机构购买该商品可参与店铺促销）/阶梯价/复购价
                         if (orderParamBo.getSvipUserFlag()) {
@@ -549,7 +550,9 @@ public class SubmitServiceImpl implements SubmitService {
                             product.setSvipPriceType(svipProductPo.getSvipPriceType());
                             product.setSvipDiscount(1 == svipProductPo.getSvipPriceType() ? svipProductPo.getSvipDiscount() : 0.00d);
                         }
-                    } else if (null != promotions || null != shopPromotions) {
+                    }
+                    // 有促销活动
+                    else if (null != promotions || null != shopPromotions) {
                         // 是否包含活动商品(受订单未支付自动关闭时间影响)  0 否 1 是
                         hasActProductFlag = true;
                         // 关闭阶梯价格，活动优先
@@ -558,7 +561,9 @@ public class SubmitServiceImpl implements SubmitService {
                         if (null != promotions && promotions.getType() == 1 && promotions.getMode() == 1) {
                             discountPrice = promotions.getTouchPrice();
                         }
-                    } else if (1 == product.getLadderPriceFlag()) {
+                    }
+                    //有阶梯价
+                    else if (1 == product.getLadderPriceFlag()) {
                         // 启用了阶梯价格
                         List<LadderPriceVo> ladderPrices = baseMapper.getLadderPriceList(productId);
                         // 判断阶梯价格的购买数量校验
@@ -574,7 +579,8 @@ public class SubmitServiceImpl implements SubmitService {
                         }
                         product.setLadderPrices(ladderPrices);
                         product.setActProduct(2);
-                    } else {
+                    }
+                    else {
                         // 复购价
                         Double repurchase = baseMapper.getRepurchasePrice(productId, orderParamBo.getUserId());
                         if (null != repurchase && repurchase > 0) {
@@ -815,6 +821,7 @@ public class SubmitServiceImpl implements SubmitService {
                     shopOrder.setOrderPromotionsId(shopPromotions.getId());
                 }
             }
+            //todo 子订单分摊优惠
             // 佣金 采美应收
             shopOrder.setBrokerage(brokerage.get());
             // 可退款金额 = 余额抵扣金额