代码提交

无关风月

2024-11-29 d25ce2cd9f6aa64c4259a5a52366415a3f83d879

代码提交

 xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseChapterController.java

@@ -84,7 +84,7 @@
        a+= byId.getVirtualLearnedNum();
        Long data1 = remoteAppUserService.getCourseChapterHistoryCount(byId.getId()).getData();
        b+=data1;
        byId.setRealLearnedNum(a+b);
        byId.setRealLearnedNum(b);
        return R.ok(byId);
    }
    @PostMapping("/updateCourseChapter")

 xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/domain/vo/ClientMeditationVO.java

@@ -36,7 +36,8 @@

    @ApiModelProperty(value = "是否已付费 1：是 2：否")
    private Integer isBuy ;

    @ApiModelProperty(value = "当前用户是否为会员 1是2否")
    private Integer isVip;
    @ApiModelProperty(value = "通用价格", notes = "价格设定为单独收费")
    private BigDecimal generalPrice;


 xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationServiceImpl.java

@@ -356,7 +356,6 @@
            List<MeditationUserFavorite> list = meditationUserFavoriteService.lambdaQuery()
                    .eq(MeditationUserFavorite::getMeditationId, id)
                    .eq(MeditationUserFavorite::getAppUserId, userid).list();

            if (list.isEmpty()){
                vo.setFavorite(2);
            }else{

 xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java

@@ -113,7 +113,7 @@
                .eq(Order::getPaymentStatus, 2)
                .ne(Order::getRefundStatus, 3).list();
        if (list.isEmpty()){
            return R.ok(0);
            return R.ok(2);
        }else{
            return R.ok(1);
        }
@@ -462,7 +462,7 @@
        if (refund!=null && (!refund.equals("success"))){
            return  R.fail(refund);
        }
        byId.setRefundStatus(2);
        byId.setRefundStatus(3);
        byId.setRefundRemark(remark);
        byId.setPaymentStatus(3);
        byId.setRefundTime(LocalDateTime.now());