|
|
@@ -3624,9 +3624,11 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
|
|
|
}
|
|
|
|
|
|
LiveUserFirstEntry liveUserFirstEntry = liveUserFirstEntryService.selectEntityByLiveIdUserId(liveOrder.getLiveId(), Long.parseLong(liveOrder.getUserId()));
|
|
|
- liveOrder.setCompanyId(liveUserFirstEntry.getCompanyId());
|
|
|
- liveOrder.setCompanyUserId(liveUserFirstEntry.getCompanyUserId());
|
|
|
- liveOrder.setTuiUserId(liveUserFirstEntry.getCompanyUserId());
|
|
|
+ if (ObjectUtil.isNotEmpty(liveUserFirstEntry)) {
|
|
|
+ liveOrder.setCompanyId(liveUserFirstEntry.getCompanyId());
|
|
|
+ liveOrder.setCompanyUserId(liveUserFirstEntry.getCompanyUserId());
|
|
|
+ liveOrder.setTuiUserId(liveUserFirstEntry.getCompanyUserId());
|
|
|
+ }
|
|
|
String orderSn = OrderCodeUtils.getOrderSn();
|
|
|
// String orderSn = "123"; // todo yhq
|
|
|
log.info("订单生成："+orderSn);
|
