vip购买相关
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package com.peanut.modules.sociology.controller;
|
||||
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.sociology.service.VipService;
|
||||
import com.peanut.modules.sociology.service.VipBuyConfigService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
@@ -14,11 +14,11 @@ import java.text.ParseException;
|
||||
@RequestMapping("sociology/user")
|
||||
public class UserController {
|
||||
@Autowired
|
||||
private VipService vipService;
|
||||
private VipBuyConfigService vipBuyConfigService;
|
||||
|
||||
@RequestMapping("/getVipProductForUser")
|
||||
public R getVipProductForUser() throws ParseException {
|
||||
return vipService.getVipProductForUser();
|
||||
return vipBuyConfigService.getVipProductForUser();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -6,6 +6,6 @@ import com.peanut.modules.common.entity.VipBuyConfigEntity;
|
||||
|
||||
import java.text.ParseException;
|
||||
|
||||
public interface VipService extends IService<VipBuyConfigEntity> {
|
||||
public interface VipBuyConfigService extends IService<VipBuyConfigEntity> {
|
||||
R getVipProductForUser() throws ParseException;
|
||||
}
|
||||
@@ -10,23 +10,20 @@ import com.peanut.modules.common.dao.VipBuyConfigDao;
|
||||
import com.peanut.modules.common.entity.MyUserEntity;
|
||||
import com.peanut.modules.common.entity.UserVip;
|
||||
import com.peanut.modules.common.entity.VipBuyConfigEntity;
|
||||
import com.peanut.modules.common.service.UserVipService;
|
||||
import com.peanut.modules.sociology.service.VipService;
|
||||
import com.peanut.modules.sociology.service.VipBuyConfigService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.DateFormat;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Slf4j
|
||||
@Service("sociologyUserService")
|
||||
public class VipServiceImpl extends ServiceImpl<VipBuyConfigDao, VipBuyConfigEntity> implements VipService {
|
||||
public class VipBuyConfigServiceImpl extends ServiceImpl<VipBuyConfigDao, VipBuyConfigEntity> implements VipBuyConfigService {
|
||||
@Autowired
|
||||
private MyUserDao myUserDao;
|
||||
@Autowired
|
||||
Reference in New Issue
Block a user