修改课程详情bug

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.DictModel;
@@ -144,8 +145,10 @@ public class DetailServiceImpl implements IDetailService {
     @Override
     public CourseInfoVO getCourseInfo(String id, double latitude, double longitude) {
         CourseInfoVO courseInfoVO = appCoursesMapper.getCourseInfo(id);
-        AppSite appSite = appSiteMapper.selectById(courseInfoVO.getSiteId());
-        courseInfoVO.setKm(PositionUtil.calculateDistance(latitude, longitude, appSite.getLatitude().doubleValue(), appSite.getLongitude().doubleValue()));
+        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.setSales(getCourseSales(id));
         List<CourseInfoVO.CourseDetailVO> courseDetailVOList = new ArrayList<>();
         appCoursesPriceRulesMapper.selectList(Wrappers.<AppCoursesPriceRules>lambdaQuery()
@@ -175,7 +178,7 @@ public class DetailServiceImpl implements IDetailService {
             courseInfoVO.setSalesYear(getCourseSales(appCourses.getId()));
             courseInfoVO.setPriceType(isFirstPurchase(user.getId()));
             courseInfoVO.setCover(list.get(0));
-            AppSite appSite = appSiteMapper.selectById(appCourses.getSiteId());
+            AppSite appSite = appSiteMapper.selectById(appCourses.getAddressSiteId());
             if (appSite!=null){
                 courseInfoVO.setAddress(appSite.getAddress());
                 double km = PositionUtil.calculateDistance(latitude, longitude, appSite.getLatitude().doubleValue(), appSite.getLongitude().doubleValue());

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/CourseInfoVO.java

@@ -4,7 +4,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.modules.system.app.entity.AppInsure;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -64,6 +63,9 @@ public class CourseInfoVO {
     @Schema(description ="纬度")
     private BigDecimal latitude;
 
+    @Schema(description = "上课地点id")
+    private String  addressSiteId;
+
 
     @Data
     @Accessors(chain = true)

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/PlaceInfoVO.java

@@ -47,6 +47,8 @@ public class PlaceInfoVO {
     private BigDecimal longitude;
     @Schema(description ="纬度")
     private BigDecimal latitude;
+    @Schema(description ="vr")
+    private String  vr;
     @Schema(description = "教练简约返回参数")
     private List<InstructorVO> instructorVOList;
     @Data

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppCoursesMapper.xml

@@ -54,6 +54,7 @@
             COUNT( c.id ) AS classHour,
             a.limit_num,
             a.reminder,
+            a.address_site_id,
             a.user_id AS instructorId,
             d.username AS instructorName,
             d.avatar AS instructorAvatar,

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppSiteMapper.xml

@@ -111,7 +111,8 @@
             b.mobile AS phone,
             a.video,
             a.longitude,
-            a.latitude
+            a.latitude,
+            a.vr
         FROM
             nm_site a
                 LEFT JOIN sys_depart b ON a.tenant_id = b.id