Merge branch 'mj' into dev

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

@@ -3145,7 +3145,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				upgradeOrderDon.setOriginalOrderId(groupsRelation.getOrderId());
 				upgradeOrderDon.setRelationId(payRequest.getRelationId());
 				upgradeOrderDon.setPackageId(payRequest.getPackageId());
-				upgradeOrderDon.setGoodsId(groupsTrips.getGoodsId());
+				upgradeOrderDon.setGoodsId(goodsDonSku.getGoodsId());
 				upgradeOrderDon.setMoney(payRequest.getDonMoney());
 				upgradeOrderDon.setStatus(UpgradeOrderDon.Status.noPayment);
 				upgradeOrderDon.setType(UpgradeOrderDon.Type.ALI_PAY);