xinquan-api/xinquan-api-course/src/main/java/com/xinquan/course/api/domain/OrderCourseVO.java
@@ -38,6 +38,8 @@ @ApiModelProperty(value = "列表封面图") private String coverUrl; @ApiModelProperty(value = "封面描述") private String coverDescription; @ApiModelProperty(value = "已学习人数") private Integer count; @ApiModelProperty(value = "支付状态 1待支付 2已支付") xinquan-auth/src/main/java/com/xinquan/auth/service/SysLoginService.java
@@ -232,6 +232,7 @@ appLoginUser.setCellPhone(cellPhone); appLoginUser.setAppUserId(appUserInfo.getId()); appLoginUser.setSysUser(sysUser); return appLoginUser; } @@ -473,7 +474,7 @@ throw new ServiceException("用户不存在或已注销"); } // 修改密码 sysUser.setPassword(body.getPassword()); sysUser.setPassword(SecurityUtils.encryptPassword(body.getPassword())); sysUserClient.updateUser(sysUser); redisService.deleteObject(CacheConstants.APP_PASSWORD_SECRET_PREFIX + body.getCellPhone()); } xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
@@ -483,6 +483,7 @@ orderCourseVO.setGeneralPrice(meditation.getGeneralPrice()); orderCourseVO.setIosPrice(meditation.getIosPrice()); orderCourseVO.setCoverUrl(meditation.getCoverUrl()); orderCourseVO.setCoverDescription(meditation.getCoverDescription()); orderCourseVO.setCount(meditation.getRealLearnedNum()+meditation.getVirtualLearnedNum()); orderCourseVOS.add(orderCourseVO); } xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationServiceImpl.java
@@ -380,8 +380,18 @@ if (tokenService.getLoginUser()!=null){ Integer data2 = remoteOrderService.getMeditationIsBuy(tokenService.getLoginUser().getUserid(), id).getData(); vo.setIsBuy(data2); List<MeditationUserFavorite> list = meditationUserFavoriteService.lambdaQuery() .eq(MeditationUserFavorite::getMeditationId, id) .eq(MeditationUserFavorite::getAppUserId, tokenService.getLoginUser().getUserid()).list(); if (list.isEmpty()){ vo.setFavorite(2); }else{ vo.setFavorite(1); } } return R.ok(vo); } @Override xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java
@@ -202,6 +202,7 @@ if (byId.getReason().equals("提现")){ AppUserWithdraw byId1 = appUserWithdrawService.getById(byId.getOrderId()); orderDetailVO.setType("提现"); orderDetailVO.setRemark("银行卡提现"); orderDetailVO.setPayOrderNo(byId1.getSerialNo()); orderDetailVO.setWithdrawType(byId1.getWithdrawType()); orderDetailVO.setAmount(byId1.getAmount()); @@ -213,7 +214,11 @@ orderDetailVO.setType("充值"); orderDetailVO.setPayType(one.getPayType()); orderDetailVO.setPayOrderNo(one.getPayOrderNo()); orderDetailVO.setRemark(one.getRemark()); if (one.getPayType()==1){ orderDetailVO.setRemark("微信支付"); }else if (one.getPayType()==2){ orderDetailVO.setRemark("支付宝支付"); } orderDetailVO.setChangeType(byId.getChangeType()); orderDetailVO.setAmount(byId.getAmount()); orderDetailVO.setPaymentTime(one.getPaymentTime()); @@ -227,7 +232,7 @@ orderDetailVO.setPaymentTime(byId.getCreateTime()); orderDetailVO.setChangeType(byId.getChangeType()); orderDetailVO.setAmount(byId.getAmount()); orderDetailVO.setRemark(one.getRemark()); orderDetailVO.setRemark("分佣收益"); if (one.getCommissionId()!=null){ AppUser appUserById = appUserService.getById(one.getCommissionId()); orderDetailVO.setUserName(appUserById.getNickname()); @@ -277,7 +282,7 @@ if (byId.getChildAppUserId() == null && one!=null){ orderDetailVO.setType("充值"); orderDetailVO.setPayType(one.getPayType()); orderDetailVO.setPayOrderNo(one.getPayOrderNo()); orderDetailVO.setPayOrderNo(one.getBizOrderNo()); orderDetailVO.setRemark(one.getRemark()); orderDetailVO.setChangeType(byId.getChangeType()); orderDetailVO.setAmount(byId.getAmount()); @@ -288,7 +293,7 @@ Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData(); if (byId.getChildAppUserId()!=null && one!=null){ orderDetailVO.setType("分佣"); orderDetailVO.setPayOrderNo(one.getPayOrderNo()); orderDetailVO.setPayOrderNo(one.getBizOrderNo()); orderDetailVO.setPaymentTime(byId.getCreateTime()); orderDetailVO.setChangeType(byId.getChangeType()); orderDetailVO.setAmount(byId.getAmount()); @@ -314,7 +319,7 @@ if (data!=null){ Course data1 = remoteCourseService.getCourseById(data.getBusinessId()).getData(); orderDetailVO.setType("课程购买"); orderDetailVO.setPayOrderNo(data.getPayOrderNo()); orderDetailVO.setPayOrderNo(data.getBizOrderNo()); orderDetailVO.setAmount(data.getBalance()); orderDetailVO.setChangeType(byId.getChangeType()); orderDetailVO.setPaymentTime(data.getPaymentTime()); @@ -324,7 +329,7 @@ if (data!=null){ Meditation data1 = remoteMeditationService.getMeditationById(data.getBusinessId()).getData(); orderDetailVO.setType("疗愈购买"); orderDetailVO.setPayOrderNo(data.getPayOrderNo()); orderDetailVO.setPayOrderNo(data.getBizOrderNo()); orderDetailVO.setAmount(data.getBalance()); orderDetailVO.setChangeType(2); orderDetailVO.setPaymentTime(data.getPaymentTime()); xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
@@ -98,6 +98,7 @@ String randomCode = String.valueOf((int) ((Math.random() * 9 + 1) * 1000)); appUser.setCode("YH"+format+randomCode); this.save(appUser); initUserTree(appUser.getId()); return appUser; } @@ -151,6 +152,7 @@ appUser.setWxOpenId(body.getWxOpenId()); String nickname = "用户" + IdUtil.fastSimpleUUID().substring(0, 6); sysUser.setNickName(nickname); appUser.setNickname(nickname); appUser.setWxName(body.getNickname()); appUser.setAvatar(body.getHeadImgUrl()); appUser.setGender(3); @@ -170,7 +172,7 @@ appLoginUser.setUsername(appUser.getNickname()); appLoginUser.setAppUserId(appUser.getId()); appLoginUser.setSysUser(sysUser); this.updateById(appUser); // if (Objects.nonNull(sysUser.getUserName())) { // appLoginUser.setCellPhone(appUser.getCellPhone()); // }
