fix 兼容之前订单

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

@@ -329,15 +329,20 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 		}
 
+		OrderMasterDon orderMasterDon = new OrderMasterDon();
 		/* 生成订单 */
 		String donNo = SEQUENCE.nextId().toString();
+		orderMasterDon.setOrderNo(donNo);
+		orderMasterDon.setOpenId(user.getOpenId());
+		orderMasterDon.setYhsId(yhsId);
+		orderMasterDon.setType(OrderMasterDon.Type.ALI_PAY);
+		orderMasterDon.setUserId(user.getId());
+
 		OrderDon orderDon = new OrderDon();
 		orderDon.setIsDp(false);
 		if (isNoLogin != null && isNoLogin) {
 			orderDon.setIsNoLogin(true);
 		}
-		orderDon.setOrderNo(donNo);
-		orderDon.setOpenId(payOpenId);
 		if (sku != null) {
 			if (sku.getPrice() == null || sku.getPrice().compareTo(BigDecimal.ZERO) <= 0) {
 				throw BusinessRuntimeException.getInstance("下单商品价格异常");
@@ -510,6 +515,19 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			});
 		}
 		orderDon.setPayTitle(payTitle.toString());
+		//主订单
+		orderMasterDon.setPayTitle(payTitle.toString());
+		orderMasterDon.setMoney(orderDon.getMoney());
+		orderMasterDon.setRealMoney(orderDon.getRealMoney());
+		orderMasterDon.setOrderType(orderDon.getOrderType());
+		orderMasterDon.setStatus(OrderMasterDon.Status.noPayment);
+		orderMasterDon.setBalance(orderDon.getBalance());
+		orderMasterDon.setGalaxycoin(orderDon.getGalaxycoin());
+		orderMasterDon.setIsDistribute(orderDon.getIsDistribute());
+		orderMasterDon.setIsFixedDistribute(orderDon.getIsFixedDistribute());
+		orderMasterDonService.save(orderMasterDon);
+
+		orderDon.setMOid(orderMasterDon.getId());
 		this.saveOrUpdate(orderDon);
 
 		if (orderDon.getIsDp()) {
@@ -1390,6 +1408,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderMasterDon.setStatus(OrderMasterDon.Status.noPayment);
 		orderMasterDon.setBalance(orderDon.getBalance());
 		orderMasterDon.setGalaxycoin(orderDon.getGalaxycoin());
+		orderMasterDon.setIsDistribute(orderDon.getIsDistribute());
+		orderMasterDon.setIsFixedDistribute(orderDon.getIsFixedDistribute());
 
 		//订单金额为0 且订单为已完成 更新虚物车票
 		if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {