|
@@ -1,5 +1,6 @@
|
|
|
package org.dromara.hotel.service.impl;
|
|
package org.dromara.hotel.service.impl;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.collection.ListUtil;
|
|
import cn.hutool.core.collection.ListUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
@@ -512,8 +513,9 @@ public class KfOrderServiceImpl implements IKfOrderService {
|
|
|
oldOrderList.forEach(item -> {
|
|
oldOrderList.forEach(item -> {
|
|
|
KfOrder kfOrder = baseMapper.selectById(item.getId());
|
|
KfOrder kfOrder = baseMapper.selectById(item.getId());
|
|
|
if(kfOrder != null){
|
|
if(kfOrder != null){
|
|
|
- KfOrder convert = MapstructUtils.convert(kfOrder, KfOrder.class);
|
|
|
|
|
- assert convert != null;
|
|
|
|
|
|
|
+ // 复制订单到convert
|
|
|
|
|
+ KfOrder convert = BeanUtil.copyProperties(kfOrder, KfOrder.class);
|
|
|
|
|
+// assert convert != null;
|
|
|
convert.setId(null);
|
|
convert.setId(null);
|
|
|
convert.setOrderStatus(HotelBusinessConstants.ORDER_STATUS_RZ);
|
|
convert.setOrderStatus(HotelBusinessConstants.ORDER_STATUS_RZ);
|
|
|
convert.setStartTime(bo.getStartTime());
|
|
convert.setStartTime(bo.getStartTime());
|