From 8e41a4215ba421b1b0be162920cd18fd792fa00e Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Wed, 19 Jun 2024 14:12:02 +0800 Subject: [PATCH 1/2] video check --- .../medical/controller/CourseController.java | 5 +++++ .../medical/service/CourseMedicalService.java | 3 +++ .../service/impl/CourseMedicalServiceImpl.java | 18 +++++++++++++----- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/peanut/modules/medical/controller/CourseController.java b/src/main/java/com/peanut/modules/medical/controller/CourseController.java index 9c9c6f33..e844c46b 100644 --- a/src/main/java/com/peanut/modules/medical/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/medical/controller/CourseController.java @@ -62,5 +62,10 @@ public class CourseController { return R.ok().put("courseList",courseList); } + @RequestMapping("/checkVideoByMD") + public R checkVideoByMD(@RequestBody Map map) throws Exception { + String playAuth = courseMedicalService.checkVideoByMD(map.get("id")); + return R.ok().put("playAuth",playAuth); + } } diff --git a/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java b/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java index 9b6d9fbe..5ca99b84 100644 --- a/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java +++ b/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java @@ -1,6 +1,7 @@ package com.peanut.modules.medical.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.common.utils.R; import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CourseMedicine; import com.peanut.modules.common.to.ParamTo; @@ -17,4 +18,6 @@ public interface CourseMedicalService extends IService { List getChildCourseMedicalTree(ParamTo param); List> getMedicalCoursePrice(); + + String checkVideoByMD(String id) throws Exception; } diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java index b0dc916c..b4f3655c 100644 --- a/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java +++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java @@ -1,10 +1,13 @@ package com.peanut.modules.medical.service.impl; +import com.aliyun.vod20170321.models.GetVideoPlayAuthResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.common.utils.R; import com.peanut.common.utils.ShiroUtils; +import com.peanut.common.utils.SpdbUtil; import com.peanut.modules.common.dao.CourseCatalogueDao; import com.peanut.modules.common.dao.CourseMedicineDao; import com.peanut.modules.common.dao.CourseToMedicineDao; @@ -16,10 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Slf4j @@ -97,7 +97,15 @@ public class CourseMedicalServiceImpl extends ServiceImpl map){ + + @Override + public String checkVideoByMD(String id) throws Exception { + GetVideoPlayAuthResponse p = SpdbUtil.getPlayAuth(id); + String playAuth = p.getBody().getPlayAuth(); + return playAuth; + } + + private void getLastLevelCourseList(CourseMedicine c, Map map){ String vip = ShiroUtils.getUser().getVip(); if (c.getChildren()!=null&&c.getChildren().size() > 0){ for (CourseMedicine child : c.getChildren()){ From 2a115db799dfec53e891c137020590545648e47f Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Wed, 19 Jun 2024 15:27:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/BuyOrderController.java | 17 +++++++++++++++-- .../common/controller/UserVipController.java | 12 ++++++++---- .../pay/weChatPay/config/WechatPayConfig.java | 2 ++ .../service/impl/WxpayServiceImpl.java | 2 ++ src/main/resources/application-dev.yml | 1 + src/main/resources/application-dev1.yml | 1 + src/main/resources/application-prod.yml | 1 + src/main/resources/application-test.yml | 1 + 8 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index c230574b..6733efe7 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -315,7 +315,13 @@ public class BuyOrderController { paymentInfo.setOrderSn(orderSn); paymentInfo.setBuyOrderId(buyOrder.getOrderId()); paymentInfo.setTotalAmount(totalPrice); - paymentInfo.setAppName(buyOrder.getAppName()); + if (buyOrder.getCome()==2){ + paymentInfo.setAppName("wumen"); + } else if (buyOrder.getCome()==1) { + paymentInfo.setAppName("zmzm"); + }else { + paymentInfo.setAppName(buyOrder.getAppName()); + } wxpayService.prepay(paymentInfo); } rabbitTemplate.convertAndSend( @@ -554,7 +560,14 @@ public class BuyOrderController { paymentInfo.setOrderSn(buyOrderEntity.getOrderSn()); paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId())); paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney()); - paymentInfo.setAppName(buyOrder.getAppName()); +// paymentInfo.setAppName(buyOrder.getAppName()); + if (buyOrder.getCome()==2){ + paymentInfo.setAppName("wumen"); + } else if (buyOrder.getCome()==1) { + paymentInfo.setAppName("zmzm"); + }else { + paymentInfo.setAppName(buyOrder.getAppName()); + } wxpayService.prepay(paymentInfo); } rabbitTemplate.convertAndSend( diff --git a/src/main/java/com/peanut/modules/common/controller/UserVipController.java b/src/main/java/com/peanut/modules/common/controller/UserVipController.java index 59636f84..e31bb764 100644 --- a/src/main/java/com/peanut/modules/common/controller/UserVipController.java +++ b/src/main/java/com/peanut/modules/common/controller/UserVipController.java @@ -80,9 +80,6 @@ public class UserVipController { String timeId = IdWorker.getTimeId().substring(0, 32); buyOrder.setOrderSn(timeId); buyOrder.setUserId(uid); - if(buyOrder.getCome()==1){ - buyOrder.setAppName("zmzm"); - } buyOrderService.save(buyOrder); BigDecimal totalPrice = buyOrder.getRealMoney(); if (Constants.PAYMENT_METHOD_VIRTUAL.equals(buyOrder.getPaymentMethod())) { @@ -112,7 +109,14 @@ public class UserVipController { paymentInfo.setOrderSn(buyOrderEntity.getOrderSn()); paymentInfo.setBuyOrderId(buyOrderEntity.getOrderId()); paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney()); - paymentInfo.setAppName(buyOrder.getAppName()); +// paymentInfo.setAppName(buyOrder.getAppName()); + if (buyOrder.getCome()==2){ + paymentInfo.setAppName("wumen"); + } else if (buyOrder.getCome()==1) { + paymentInfo.setAppName("zmzm"); + }else { + paymentInfo.setAppName(buyOrder.getAppName()); + } wxpayService.prepay(paymentInfo); } rabbitTemplate.convertAndSend( diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java b/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java index 407e3875..dccde641 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java @@ -45,6 +45,8 @@ public class WechatPayConfig implements Serializable { private String appId;//fzds @Value("${wxpay.zmzmappId}") private String zmzmappId; + @Value("${wxpay.wumenappId}") + private String wumenappId; /** * 商户号 */ diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java index 8a8bce0c..8ce6f3f0 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java @@ -86,6 +86,8 @@ public class WxpayServiceImpl extends ServiceImpl