xinquan-api/xinquan-api-order/src/main/java/com/xinquan/order/api/domain/vo/PayOrderVO.java
@@ -21,9 +21,11 @@ @ApiModelProperty(value = "类型 1冥想 2课程") private Integer orderFrom; @ApiModelProperty(value = "冥想id/课程id") private Long targetId; private Long id; @ApiModelProperty(value = "订单金额") private BigDecimal amount; @ApiModelProperty(value = "订单id") private Long orderId; @ApiModelProperty(value = "封面图") private String coverUrl; } xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
@@ -623,6 +623,7 @@ Course byId = courseService.getById(id); ClientCourseVO clientCourseVO = new ClientCourseVO(); BeanUtils.copyProperties(byId, clientCourseVO); clientCourseVO.setIsBuy(2); List<AppUser> data = remoteAppUserService.getUserByCourseId(id).getData(); if (byId.getChargeType()==1 && tokenService.getLoginUser()==null){ if (data!=null){ @@ -716,7 +717,7 @@ } } clientCourseVO.setList(page); clientCourseVO.setIsBuy(2); // 查询推荐课程 List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, byId.getCateId()) .eq(Course::getCourseType,1) xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
@@ -123,7 +123,8 @@ Meditation data = remoteMeditationService.getMeditationById(byId.getBusinessId()).getData(); payOrderVO.setTitle(data.getMeditationTitle()); payOrderVO.setOrderFrom(1); payOrderVO.setTargetId(data.getId()); payOrderVO.setCoverUrl(data.getCoverUrl()); payOrderVO.setId(data.getId()); switch (type){ case 1: payOrderVO.setAmount(data.getGeneralPrice()); @@ -140,7 +141,8 @@ payOrderVO.setTitle(data.getCourseTitle()); payOrderVO.setTutor(data.getTutor()); payOrderVO.setOrderFrom(2); payOrderVO.setTargetId(data.getId()); payOrderVO.setCoverUrl(data.getCoverUrl()); payOrderVO.setId(data.getId()); switch (type){ case 1: payOrderVO.setAmount(data.getGeneralPrice()); @@ -165,10 +167,10 @@ }) public R<List<OrderCourseVO>> balanceList(Integer state, Integer pageCurr, Integer pageSize) { LoginUser loginUser = tokenService.getLoginUser(); Long userId = loginUser.getUserid(); if (loginUser==null){ return R.tokenError("登录失效"); } Long userId = loginUser.getUserid(); List<OrderCourseVO> res = new ArrayList<>(); List<Order> page = orderService.lambdaQuery() .eq(Order::getOrderFrom, state) @@ -348,7 +350,6 @@ @RequestParam(value = "orderFrom") Integer orderFrom, @RequestParam(value = "receiverId", required = false) Long receiverId, @RequestParam(value = "balanceFlag", required = false) Integer balanceFlag, @RequestParam(value = "payType") Integer payType, @RequestParam(value = "amount", required = false) BigDecimal amount, @RequestParam(value = "vipType", required = false) Integer vipType, @RequestParam(value = "transactionIdentifier")String transactionIdentifier) xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java
@@ -279,7 +279,6 @@ orderDetailVO.setPaymentTime(byId1.getUpdateTime()); }else if (byId.getReason().equals("充值")){ Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData(); if (byId.getChildAppUserId() == null && one!=null){ orderDetailVO.setType("充值"); orderDetailVO.setPayType(one.getPayType()); orderDetailVO.setPayOrderNo(one.getBizOrderNo()); @@ -288,7 +287,6 @@ orderDetailVO.setAmount(byId.getAmount()); orderDetailVO.setPaymentTime(one.getPaymentTime()); return R.ok(orderDetailVO); } }else if (byId.getReason().equals("分佣收益")){ Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData(); if (byId.getChildAppUserId()!=null && one!=null){
