feat(app): 设置课程和订单地址信息- 在课程详情中设置地址名称

- 在订单服务中使用场地名称作为地址-为订单产品信息添加地址详情

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/DetailServiceImpl.java

@@ -217,6 +217,7 @@ public class DetailServiceImpl implements IDetailService {
         AppSite appSite = appSiteMapper.selectById(courseInfoVO.getAddressSiteId());
         if (appSite!=null&& ObjectUtils.isNotEmpty(appSite.getLatitude())&& ObjectUtils.isNotEmpty(appSite.getLongitude())){
             courseInfoVO.setKm(PositionUtil.calculateDistance(latitude, longitude, appSite.getLatitude().doubleValue(), appSite.getLongitude().doubleValue()));
+            courseInfoVO.setAddress(appSite.getName());
         }
         courseInfoVO.setSales(getCourseSales(id));
         List<CourseInfoVO.CourseDetailVO> courseDetailVOList = new ArrayList<>();

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -1548,7 +1548,7 @@ public class OrderServiceImpl implements IOrderService {
             if (courseSite.getType() == 0) {
                 appOrderInfoDTO.setOrSchoolCourse(1);
             }
-            appOrderInfoDTO.setCourseSiteAddress(courseSite.getAddress());
+            appOrderInfoDTO.setCourseSiteAddress(courseSite.getName());
             appOrderInfoDTO.setLatitude(courseSite.getLatitude());
             appOrderInfoDTO.setLongitude(courseSite.getLongitude());
             appOrderInfoDTO.setPhone(courseSite.getPhone());
@@ -1777,6 +1777,9 @@ public class OrderServiceImpl implements IOrderService {
             if (ObjectUtil.isNotEmpty(proInfoList)) {
                 List<AppOrderProInfo> infoList = proInfoList.stream().filter(orderProInfo -> !Objects.equals(orderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_6)).collect(Collectors.toList());
                 List<AppOrderProInfo> insureList = proInfoList.stream().filter(orderProInfo -> Objects.equals(orderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_6)).collect(Collectors.toList());
+                infoList.forEach(a->{
+                    a.setAddress(appSiteMapper.selectById(record.getAddressSiteId()).getName());
+                });
                 record.setOrderProInfoList(infoList);
                 record.setOrderInsureList(insureList);
             }