Преглед изворни кода

记录渠道规则平摊金额

zoujiajian пре 2 година
родитељ
комит
b91433f865

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/DistributeWaitingSendPoints.java

@@ -52,6 +52,11 @@ public class DistributeWaitingSendPoints extends BaseEntity{
 	 */
 	private Boolean isRule;
 
+	/**
+	 * 平摊积分
+	 */
+	private BigDecimal deductPoints;
+
 	/**
 	 * 获取提成比例
 	 */

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

@@ -2440,6 +2440,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						Coupon coupon = couponDistributePopularizeMapper.selectDiscountCouponByUserId(distributeId, order.getSkuId());
 						//未配置对应折扣
 						//按优惠多少对半平摊
+						BigDecimal real_points = points;
 						if (coupon == null) {
 							BigDecimal splitDiscount = BigDecimal.valueOf(1).subtract(plat_discount);
 							BigDecimal avg = realMoney.multiply(splitDiscount).divide(BigDecimal.valueOf(2));
@@ -2448,6 +2449,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 								points = BigDecimal.ZERO;
 							}
 							distributeWaitingSendPoints.setIsRule(true);
+							//平摊积分
+							distributeWaitingSendPoints.setDeductPoints(real_points.subtract(points));
 						}
 						if (coupon != null) {
 							BigDecimal distribute_discount = coupon.getDiscount();
@@ -2462,6 +2465,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 									points = BigDecimal.ZERO;
 								}
 								distributeWaitingSendPoints.setIsRule(true);
+								//平摊积分
+								distributeWaitingSendPoints.setDeductPoints(real_points.subtract(points));
 							}
 						}
 					}