zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

Browse Source
This commit is contained in:
wuchunlei
2024-06-19 18:01:45 +08:00
parent 0e9b9152f8 2a115db799
commit 066f50ddcc
11 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -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(

12
src/main/java/com/peanut/modules/common/controller/UserVipController.java
View File

@@ -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(

5
src/main/java/com/peanut/modules/medical/controller/CourseController.java
View File

@@ -62,5 +62,10 @@ public class CourseController {
return R.ok().put("courseList",courseList);
}
@RequestMapping("/checkVideoByMD")
public R checkVideoByMD(@RequestBody Map<String,String> map) throws Exception {
String playAuth = courseMedicalService.checkVideoByMD(map.get("id"));
return R.ok().put("playAuth",playAuth);
}
}

3
src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java
View File

@@ -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<CourseMedicine> {
List<CourseMedicine> getChildCourseMedicalTree(ParamTo param);
List<Map<String,Object>> getMedicalCoursePrice();
String checkVideoByMD(String id) throws Exception;
}

18
src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java
View File

@@ -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<CourseMedicineDao, Cou
return res;
}
private void getLastLevelCourseList(CourseMedicine c,Map<String,Object> 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<String,Object> map){
String vip = ShiroUtils.getUser().getVip();
if (c.getChildren()!=null&&c.getChildren().size() > 0){
for (CourseMedicine child : c.getChildren()){

2
src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java
View File

@@ -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;
/**
* 商户号
*/

2
src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
View File

@@ -86,6 +86,8 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
appid = wechatPayConfig.getAppId();
}else if ("zmzm".equals(paymentInfo.getAppName())){
appid = wechatPayConfig.getZmzmappId();
} else if ("wumen".equals(paymentInfo.getAppName())) {
appid = wechatPayConfig.getWumenappId();
}
// app id
paramMap.put("appid", appid);

1
src/main/resources/application-dev.yml
View File

@@ -78,6 +78,7 @@ server:
wxpay:
appId: wx47134a8f15083734
zmzmappId: wx912aa600132dc965
wumenappId: wx6b17b40171dea988
# wmysappId: wx47134a8f15083734
mchId: 1612860909
payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app

1
src/main/resources/application-dev1.yml
View File

@@ -78,6 +78,7 @@ server:
wxpay:
appId: wx47134a8f15083734
zmzmappId: wx912aa600132dc965
wumenappId: wx6b17b40171dea988
mchId: 1612860909
payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app
notifyUrl: https://testapi.nuttyreading.com/pay/payNotify

1
src/main/resources/application-prod.yml
View File

@@ -76,6 +76,7 @@ server:
wxpay:
appId: wx47134a8f15083734
zmzmappId: wx912aa600132dc965
wumenappId: wx6b17b40171dea988
mchId: 1612860909
payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app
notifyUrl: https://api.nuttyreading.com/pay/payNotify

1
src/main/resources/application-test.yml
View File

@@ -77,6 +77,7 @@ server:
wxpay:
appId: wx47134a8f15083734
zmzmappId: wx912aa600132dc965
wumenappId: wx6b17b40171dea988
# wmysappId: wx47134a8f15083734
mchId: 1612860909
payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app