Selaa lähdekoodia

fix 实物分销

zoujiajian 3 vuotta sitten
vanhempi
sitoutus
218b613ebf

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/UserTicketClearedRecordView.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "user_ticket_cleared_record ur left join account a on a.id = ur.account_id" +
-		" left join goods_don g on g.id = ur.goods_id left join goods_don_sku gdk on gdk.id = ur.skuId" +
+		" left join goods_don g on g.id = ur.goods_id left join goods_don_sku gdk on gdk.id = ur.sku_id" +
 		" left join user u on u.id = ur.user_id left join corp_user cu on cu.unionid = u.unionid")
 public class UserTicketClearedRecordView {
 	@DbField("ur.id")

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

@@ -1371,7 +1371,13 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					if (userPlatDistributeRate != null) {
 						rate = userPlatDistributeRate.getRate();
 						if (goodsDon != null && goodsDon.getType() == 2) {
-							rate = userPlatDistributeRate.getSecondRate();
+							GoodsDonSku goodsDonSku = goodsDonSkuMapper.selectById(order.getSkuId());
+							if (goodsDonSku != null) {
+								//不包含套餐权益
+								if (!goodsDonSku.getIsBenefits()) {
+									rate = userPlatDistributeRate.getSecondRate();
+								}
+							}
 						}
 						returnMoney = orderMoney.multiply(BigDecimal.valueOf(rate)).divide(BigDecimal.valueOf(100));
 					}