Merge branch 'mj' into dev

netflix-dao/src/main/java/com/cyksj/model/request/OrderPayRequest.java

@@ -170,4 +170,9 @@ public class OrderPayRequest {
      * 套餐id
      */
     private Long packageId;
+
+    /**
+     * 源订单id
+     */
+    private Long originalOrderId;
 }

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

@@ -3142,7 +3142,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				UpgradeOrderDon upgradeOrderDon = new UpgradeOrderDon();
 				upgradeOrderDon.setOrderNo(donNo);
 				upgradeOrderDon.setUserId(payRequest.getUserId());
-				upgradeOrderDon.setOriginalOrderId(groupsRelation.getOrderId());
+				upgradeOrderDon.setOriginalOrderId(payRequest.getOriginalOrderId());
 				upgradeOrderDon.setRelationId(payRequest.getRelationId());
 				upgradeOrderDon.setPackageId(payRequest.getPackageId());
 				upgradeOrderDon.setGoodsId(goodsDonSku.getGoodsId());