|
@@ -16,7 +16,6 @@ import org.jeecg.modules.app.service.IOrderService;
|
|
|
import org.jeecg.modules.app.vo.OrderVO;
|
|
|
import org.jeecg.modules.system.app.entity.*;
|
|
|
import org.jeecg.modules.system.app.mapper.*;
|
|
|
-import org.jeecg.modules.system.entity.SysDepart;
|
|
|
import org.jeecg.modules.system.mapper.SysDepartMapper;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -184,8 +183,8 @@ public class OrderServiceImpl implements IOrderService {
|
|
|
throw new IllegalStateException("关联场地不存在");
|
|
|
}
|
|
|
List<OrderVO.PreviewOrderTimePeriod> timePeriod = appSitePriceRulesMapper.previewOrderPlaceGymnasiumChartered(list);
|
|
|
- SysDepart depart = sysDepartMapper.selectOne(Wrappers.<SysDepart>lambdaQuery()
|
|
|
- .eq(SysDepart::getOrgCode, sitePlace.getOrgCode()));
|
|
|
+ AppSite appSite = appSiteMapper.selectOne(Wrappers.<AppSite>lambdaQuery()
|
|
|
+ .eq(AppSite::getOrgCode, sitePlace.getOrgCode()));
|
|
|
return result.setTimePeriod(timePeriod)
|
|
|
.setEarlyRefundTime(sitePlace.getEarlyRefundTime())
|
|
|
.setPlaceId(sitePlace.getId())
|
|
@@ -195,7 +194,7 @@ public class OrderServiceImpl implements IOrderService {
|
|
|
.setMobile(user.getPhone())
|
|
|
.setTotalPrice(totalPrice) // 总价即为所有价格之和
|
|
|
.setSubtotal(totalPrice) // 小计与总价相同
|
|
|
- .setStoreName(depart != null ? depart.getDepartName() : "未知门店");
|
|
|
+ .setStoreName(appSite != null ? appSite.getName() : "未知门店");
|
|
|
}
|
|
|
|
|
|
@Override
|