xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/inner/InnerCourseController.java
@@ -47,7 +47,9 @@ public R<Course> getCourseById(@PathVariable("targetId") Long targetId) { Course byId = courseService.getById(targetId); CourseCategory byId1 = courseCategoryService.getById(byId.getCateId()); if (byId1!=null){ byId.setCategoryName(byId1.getName()); } int size = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, targetId) .list().size(); byId.setCourseChapterCount(Long.valueOf(size)); xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationQuestionController.java
@@ -301,7 +301,7 @@ MeditationQuestion byId = meditationQuestionService.getById(id); homeBackgroundMusic.setUpdateBy(SecurityUtils.getUsername()); homeBackgroundMusic.setUpdateTime(LocalDateTime.now()); if (homeBackgroundMusic.getType() == 1){ if (homeBackgroundMusic.getType() == 2){ homeBackgroundMusic.setReplyTime(LocalDateTime.now()); // 给用户添加一条系统消息 NoticeRecord noticeRecord = new NoticeRecord(); xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
@@ -485,7 +485,7 @@ } for (Order record : page) { record.setUid(record.getId().toString()); record.setPlatformMoney(record.getRealPayAmount().subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount())); record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount():record.getTotalAmount().subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount())); AppUser byId1 = remoteAppUserService.getAppUserById(record.getAppUserId()+"").getData(); if (Objects.nonNull(byId1)){ record.setUserName(byId1.getNickname()); @@ -1151,7 +1151,7 @@ if (data!=null){ record.setCategoryMeditationName(data.getCategoryName()); record.setMeditationTitle(data.getMeditationTitle()); record.setIconUrl(data.getIconUrl()); record.setIconUrl(data.getCoverUrl()); record.setDetailDescription(data.getDetailDescription()); record.setGeneralPriceMeditation(data.getGeneralPrice()); record.setListingStatusMeditation(data.getListingStatus()); xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java
@@ -108,11 +108,13 @@ order.setAppUserId(userId); order.setRealPayAmount(meditation.getGeneralPrice()); order.setPayType(payType); order.setBuyContent("购买疗愈【"+meditationTitle+"】"); order.setTotalAmount(meditation.getGeneralPrice()); order.setGiveUserId(receiverId); this.save(order); }else{ order = this.getById(orderId); order.setBuyContent("购买疗愈【"+meditationTitle+"】"); } Long orderId9 = order.getId(); @@ -128,6 +130,7 @@ // 抵扣后金额为0 为余额支付 order.setPayType(4); order.setRealPayAmount(meditation.getGeneralPrice()); order.setBuyContent("购买疗愈【"+meditationTitle+"】"); this.updateById(order); return clientPlaceOrderVO; }else{ @@ -146,6 +149,7 @@ // 支付宝+余额 order.setPayType(6); } order.setBuyContent("购买疗愈【"+meditationTitle+"】"); this.updateById(order); // 创建支付订单 createPayment(payType, orderNo, needPayAmount, meditationTitle, detailDescription, @@ -171,11 +175,14 @@ order.setGiveUserId(receiverId); order.setBusinessId(course.getId()); order.setAppUserId(userId); order.setBuyContent("购买课程【"+courseTitle+"】"); order.setRealPayAmount(course.getGeneralPrice()); order.setTotalAmount(course.getGeneralPrice()); this.save(order); }else{ order = this.getById(orderId); order.setBuyContent("购买课程【"+courseTitle+"】"); } Long orderId8 = order.getId(); clientPlaceOrderVO.setOrderNo(orderNo); @@ -191,6 +198,8 @@ // 抵扣后金额为0 为余额支付 order.setPayType(4); order.setRealPayAmount(course.getGeneralPrice()); order.setBuyContent("购买课程【"+courseTitle+"】"); this.updateById(order); return clientPlaceOrderVO; }else{ @@ -209,6 +218,8 @@ // 支付宝+余额 order.setPayType(6); } order.setBuyContent("购买课程【"+courseTitle+"】"); this.updateById(order); // 创建支付订单 createPayment(payType, orderNo, needPayAmount, courseTitle, description, @@ -336,7 +347,9 @@ // 调用第三方支付获取支付信息 JSONObject payInfo = JuHeFuUtil.createPayment1(orderNo, payType, needPayAmount.toString(), goodsTitle, goodsDesc, IpUtils.getIpAddr(), wxOpenId, "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback"); IpUtils.getIpAddr(), wxOpenId, // "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback") "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"); // 第三方支付记录 OrderPaymentRecord paymentRecord = new OrderPaymentRecord(); paymentRecord.setOrderId(orderId); @@ -358,7 +371,9 @@ // 调用第三方支付获取支付信息 JSONObject payInfo = JuHeFuUtil.createPayment(orderNo, payType, needPayAmount.toString(), goodsTitle, goodsDesc, IpUtils.getIpAddr(), wxOpenId, "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback"); IpUtils.getIpAddr(), wxOpenId, // "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback") "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"); // 第三方支付记录 OrderPaymentRecord paymentRecord = new OrderPaymentRecord(); paymentRecord.setOrderId(orderId); xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/utils/JuHeFuUtil.java
@@ -104,7 +104,8 @@ createPaymentCode("CZ19281833123", 1, "0.01", "充值", "充值", "127.0.0.1", "openId", "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback"); // "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback") "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"); // String orderNo = OrderUtil.getOrderNoForPrefix("User"); // createUser("usera12937812893718297391"); //// balancePay("12345678912", "0.01", "http://www.baidu.com"); xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HotWordsController.java
@@ -83,7 +83,7 @@ hotWordsService.update(hotWordsLambdaUpdateWrapper); return R.ok(); } @PostMapping("/delete") @DeleteMapping("/delete") @ApiOperation(value = "热词管理-删除热词", tags = {"管理后台-运营中心"}) public R add(String id) { hotWordsService.removeById(Long.valueOf(id)); xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
@@ -965,6 +965,7 @@ } courseLambdaQueryWrapper.in(AppUser::getId, collect); } courseLambdaQueryWrapper.isNotNull(AppUser::getCellPhone); Page<AppUser> page = appUserService.page(new Page<>(courseDTO.getPageCurr(), courseDTO.getPageSize()), courseLambdaQueryWrapper); if (CollUtils.isEmpty(page.getRecords())) { return R.ok(PageDTO.empty(page)); xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserTreeController.java
@@ -409,7 +409,7 @@ noticeRecord.setReadStatus(1); noticeRecord.setNoticeType(1); noticeRecord.setTitle("树苗升级通知"); noticeRecord.setContent("恭喜,您的树苗已升至"+y+"级,"+"继续加油哦"); noticeRecord.setContent("恭喜,您的树苗已升至"+x+"级,"+"继续加油哦"); noticeRecordService.save(noticeRecord); } return R.ok(wateringVO); xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java
@@ -91,7 +91,7 @@ wrapper.in(AppUserWithdraw::getAppUserId,collect); } if (courseDTO.getPaymentStatus()!=null && courseDTO.getPaymentStatus()==1){ wrapper.eq(AppUserWithdraw::getId,0); wrapper.eq(AppUserWithdraw::getWithdrawStatus,0); }else if (courseDTO.getPaymentStatus()!=null &&(courseDTO.getPaymentStatus()==2 || courseDTO.getPaymentStatus()==3)){ List<Integer> integers = new ArrayList<>(); integers.add(1);
