zoujiajian hace 1 año
padre
commit
5f351b57ec

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

@@ -2479,7 +2479,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 	 * 更新车票状态
 	 */
 	public void updateGroupsTicket(OrderDon orderDon, GoodsDon goodsDon, GoodsDonSku sku) {
-		if (orderDon.getOrderType() == 2 && orderDon.getIsChangeTicket()) {
+		if (orderDon.getOrderType() != null && orderDon.getOrderType() == 2 && orderDon.getIsChangeTicket() != null && orderDon.getIsChangeTicket()) {
 			//将奈飞月付车票更换成其他规格的车票
 			changeTicketAndRecord(orderDon, sku);
 		} else {
@@ -3979,6 +3979,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			sku = goodsDonSkuMapper.selectById(orderPayRequest.getSkuId());
 		}
 		orderDon.setMoney(sku.getPrice());
+		orderDon.setOrderType(1);
 		GoodsDon goodsDon = goodsDonMapper.selectById(sku.getGoodsId());
 		Long relationId = 0l;
 		if (userBenefits.getType() == UserBenefits.Type.RENEW) {