培训班
This commit is contained in:
@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.common.entity.MyUserEntity;
|
||||
import com.peanut.modules.common.entity.TrainingClass;
|
||||
import com.peanut.modules.common.entity.TrainingToUser;
|
||||
import com.peanut.modules.common.entity.VipBuyConfigEntity;
|
||||
import com.peanut.modules.common.entity.*;
|
||||
import com.peanut.modules.common.service.BuyOrderService;
|
||||
import com.peanut.modules.common.service.MyUserService;
|
||||
import com.peanut.modules.common.service.TrainingClassService;
|
||||
import com.peanut.modules.common.service.TrainingToUserService;
|
||||
@@ -39,6 +37,8 @@ public class TrainingClassController {
|
||||
private MyUserService userService;
|
||||
@Autowired
|
||||
private VipBuyConfigService vipBuyConfigService;
|
||||
@Autowired
|
||||
private BuyOrderService buyOrderService;
|
||||
|
||||
//vip商品类型
|
||||
@RequestMapping("/getVipBuyConfigList")
|
||||
@@ -93,9 +93,9 @@ public class TrainingClassController {
|
||||
wrapper.orderByAsc(TrainingClass::getSort);
|
||||
wrapper.orderByDesc(TrainingClass::getCreateTime);
|
||||
}
|
||||
Page<TrainingClass> trainingClassList = trainingClassService.page(new Page<>(
|
||||
Page<TrainingClass> trainingClassPage = trainingClassService.page(new Page<>(
|
||||
Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper);
|
||||
return R.ok().put("trainingClassList",trainingClassList);
|
||||
return R.ok().put("trainingClassList",trainingClassPage);
|
||||
}
|
||||
|
||||
//培训班下用户列表
|
||||
@@ -106,11 +106,22 @@ public class TrainingClassController {
|
||||
wrapper.selectAll(TrainingToUser.class);
|
||||
wrapper.eq(TrainingToUser::getTrainingId,params.get("trainingId"));
|
||||
wrapper.like(StringUtils.isNotEmpty(params.get("tel").toString()),MyUserEntity::getTel,params.get("tel"));
|
||||
wrapper.orderByDesc(TrainingToUser::getCreateTime);
|
||||
if ("2".equals(params.get("createTimeSort").toString())){
|
||||
wrapper.orderByAsc(TrainingToUser::getCreateTime);
|
||||
}else {
|
||||
wrapper.orderByDesc(TrainingToUser::getCreateTime);
|
||||
}
|
||||
Page<TrainingToUser> trainingClassUserList = trainingToUserService.page(new Page<>(
|
||||
Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper);
|
||||
for (TrainingToUser toUser:trainingClassUserList.getRecords()){
|
||||
toUser.setUser(userService.getById(toUser.getUserId()));
|
||||
if (StringUtils.isNotEmpty(toUser.getOrderSn())){
|
||||
BuyOrder buyOrder = buyOrderService.getOne(new LambdaQueryWrapper<BuyOrder>()
|
||||
.eq(BuyOrder::getOrderSn,toUser.getOrderSn()));
|
||||
toUser.setPayMethod("1".equals(buyOrder.getPaymentMethod())?"微信":("2".equals(buyOrder.getPaymentMethod())?"支付宝":"虚拟币"));
|
||||
toUser.setRealMoney(buyOrder.getRealMoney().toString());
|
||||
toUser.setJfDeduction(buyOrder.getJfDeduction().toString());
|
||||
}
|
||||
}
|
||||
return R.ok().put("trainingClassUserList",trainingClassUserList);
|
||||
}
|
||||
@@ -129,6 +140,13 @@ public class TrainingClassController {
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
//培训班删除用户
|
||||
@RequestMapping("/delUserToTrainingClass")
|
||||
public R delUserToTrainingClass(@RequestBody Map<String,Object> params) {
|
||||
trainingToUserService.removeById(params.get("id").toString());
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user