Browse Source

fix 去掉普通分销镜像规格分销20%

zoujiajian 10 tháng trước cách đây
mục cha
commit
0a45793e00

+ 22 - 22
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -2125,28 +2125,28 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						if (goodsDonSku == null) {
 							goodsDonSku = goodsDonSkuMapper.selectById(order.getSkuId());
 						}
-						if (goodsDonSku.getIsMirror()) {
-							//镜像规格 默认百分之20 提成
-							distributeWaitingSendPoints.setRate(20);
-							//最新返利积分
-							BigDecimal newReturnMoney = orderMoney.multiply(BigDecimal.valueOf(distributeWaitingSendPoints.getRate())).divide(BigDecimal.valueOf(100));
-							points = newReturnMoney.multiply(BigDecimal.valueOf(distributePointsExchangeMoney.getPoints())).divide(distributePointsExchangeMoney.getMoney(), 2, RoundingMode.HALF_DOWN);
-							distributeWaitingSendPoints.setPoints(points);
-						} else {
-							//额外返利 去除
-//							DistributeExtraRebateConfig distributeExtraRebateConfig = distributeExtraRebateService.getRandomExtraRebate();
-//							if (distributeExtraRebateConfig != null) {
-//								BigDecimal multiple = distributeExtraRebateConfig.getMultiple();
-//								if (multiple.compareTo(BigDecimal.ONE) > 0) {
-//									//最终奖励
-//									BigDecimal finalPoints = points.multiply(multiple);
-//									distributeWaitingSendPoints.setPoints(finalPoints);
-//
-//									distributeWaitingSendPoints.setExtraMultiple(multiple);
-//									distributeWaitingSendPoints.setExtraRebate(finalPoints.subtract(points));
-//								}
-//							}
-						}
+//						if (goodsDonSku.getIsMirror()) {
+//							//镜像规格 默认百分之20 提成
+//							distributeWaitingSendPoints.setRate(20);
+//							//最新返利积分
+//							BigDecimal newReturnMoney = orderMoney.multiply(BigDecimal.valueOf(distributeWaitingSendPoints.getRate())).divide(BigDecimal.valueOf(100));
+//							points = newReturnMoney.multiply(BigDecimal.valueOf(distributePointsExchangeMoney.getPoints())).divide(distributePointsExchangeMoney.getMoney(), 2, RoundingMode.HALF_DOWN);
+//							distributeWaitingSendPoints.setPoints(points);
+//						} else {
+//							//额外返利 去除
+////							DistributeExtraRebateConfig distributeExtraRebateConfig = distributeExtraRebateService.getRandomExtraRebate();
+////							if (distributeExtraRebateConfig != null) {
+////								BigDecimal multiple = distributeExtraRebateConfig.getMultiple();
+////								if (multiple.compareTo(BigDecimal.ONE) > 0) {
+////									//最终奖励
+////									BigDecimal finalPoints = points.multiply(multiple);
+////									distributeWaitingSendPoints.setPoints(finalPoints);
+////
+////									distributeWaitingSendPoints.setExtraMultiple(multiple);
+////									distributeWaitingSendPoints.setExtraRebate(finalPoints.subtract(points));
+////								}
+////							}
+//						}
 					}
 					try {
 						distributeWaitingSendPointsMapper.insert(distributeWaitingSendPoints);