cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.activity.entity.*; import com.dsh.activity.feignclient.course.CoursePackageClient; import com.dsh.activity.feignclient.course.CoursePackageConfigClient; import com.dsh.activity.feignclient.course.model.CoursePackage; import com.dsh.activity.feignclient.course.model.CoursePackagePaymentConfig; import com.dsh.activity.feignclient.model.IntegralCommodity; import com.dsh.activity.feignclient.model.ProductDetailRequest; import com.dsh.activity.feignclient.model.ProductDetailsVo; @@ -45,6 +47,9 @@ @Autowired private StoreClient stoClient; @Autowired private CoursePackageConfigClient cpcfigClient; @Autowired private PointsMerchandiseStoreService pmdstoService; @@ -141,8 +146,13 @@ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(pointsMerchandiseStore.getStoreId()); detailsVo.setBelongs(courseOfStore.getStoreName()+"可用"); } // TODO: 2023/7/12 课包的课时 // detailsVo.setCourseHours(); List<CoursePackagePaymentConfig> courseConfigList = cpcfigClient.getCourseConfigList(coursePackage.getId()); int redul = 0; for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) { redul = redul + coursePackagePaymentConfig.getClassHours(); } detailsVo.setCourseHours(redul); detailsVo.setStartTime(format.format(merchandise.getStartTime())); detailsVo.setEndTime(format.format(merchandise.getEndTime()));
New file @@ -0,0 +1,18 @@ package com.dsh.activity.feignclient.course; import com.dsh.activity.feignclient.course.model.CoursePackagePaymentConfig; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @FeignClient(value = "mb-cloud-course") public interface CoursePackageConfigClient { @PostMapping("/base/coursePack/getCoursePackageConfig") List<CoursePackagePaymentConfig> getCourseConfigList(@RequestBody Integer coursePackageId); } cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/model/CoursePackagePaymentConfig.java
New file @@ -0,0 +1,31 @@ package com.dsh.activity.feignclient.course.model; import lombok.Data; /** * @author zhibing.pu * @date 2023/6/29 10:42 */ @Data public class CoursePackagePaymentConfig { /** * 主键 */ private Integer id; /** * 课包id */ private Integer coursePackageId; /** * 课时数 */ private Integer classHours; /** * 现金支付价格 */ private Double cashPayment; /** * 玩湃币价格 */ private Integer playPaiCoin; } cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -693,4 +693,11 @@ } } @PostMapping("/base/coursePack/getCoursePackageConfig") public List<CoursePackagePaymentConfig> getCourseConfigList(@RequestBody Integer coursePackageId){ return icppcService.list(new QueryWrapper<CoursePackagePaymentConfig>() .eq("coursePackageId",coursePackageId)); } } cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePackageConfigClient.java
New file @@ -0,0 +1,18 @@ package com.dsh.course.feignclient; import com.dsh.course.entity.CoursePackagePaymentConfig; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @FeignClient(value = "mb-cloud-course") public interface CoursePackageConfigClient { @PostMapping("/base/coursePack/getCoursePackageConfig") List<CoursePackagePaymentConfig> getCourseConfigList(@RequestBody Integer coursePackageId); }
