修改vipprice,用户会员类型修改
This commit is contained in:
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.common.utils.ShiroUtils;
|
||||
import com.peanut.modules.book.service.ShopProductService;
|
||||
import com.peanut.modules.common.dao.*;
|
||||
import com.peanut.modules.common.entity.*;
|
||||
import com.peanut.modules.common.service.MyUserService;
|
||||
@@ -27,9 +28,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
@Autowired
|
||||
private UserVipService userVipService;
|
||||
@Autowired
|
||||
private CourseToSociologyDao courseToSociologyDao;
|
||||
private ShopProductService shopProductService;
|
||||
@Autowired
|
||||
private CourseToMedicineDao courseToMedicineDao;
|
||||
private CourseToSociologyDao courseToSociologyDao;
|
||||
@Autowired
|
||||
private CourseCatalogueDao courseCatalogueDao;
|
||||
@Autowired
|
||||
@@ -45,8 +46,6 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
@Autowired
|
||||
private UserCourseStudyingDao studyingDao;
|
||||
@Autowired
|
||||
private MyUserDao userDao;
|
||||
@Autowired
|
||||
private ShopProductDao shopProductDao;
|
||||
@Autowired
|
||||
private UserVipDao userVipDao;
|
||||
@@ -126,9 +125,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
if (StringUtils.isNotEmpty(course.getRelationProductIds())){
|
||||
String[] ids = course.getRelationProductIds().split(",");
|
||||
List<ShopProduct> shopProductList = shopProductDao.selectList(new LambdaQueryWrapper<ShopProduct>()
|
||||
.select(ShopProduct::getProductId,ShopProduct::getProductImages,ShopProduct::getProductName,ShopProduct::getActivityPrice,ShopProduct::getPrice)
|
||||
.select(ShopProduct::getProductId,ShopProduct::getProductImages,ShopProduct::getProductName,ShopProduct::getActivityPrice,ShopProduct::getPrice,ShopProduct::getIsVipPrice,ShopProduct::getGoodsType)
|
||||
.in(ShopProduct::getProductId, ids)
|
||||
.orderByAsc(ShopProduct::getSort));
|
||||
for (ShopProduct shopProduct : shopProductList) {
|
||||
if (!userVipService.noVip()&&shopProduct.getIsVipPrice()==1){
|
||||
shopProduct.setVipPrice(shopProductService.getVipPrice(shopProduct));
|
||||
}
|
||||
}
|
||||
flag.put("shopProductList",shopProductList);
|
||||
}
|
||||
//目录信息
|
||||
|
||||
@@ -9,6 +9,7 @@ import com.peanut.modules.common.dao.ShopProductBookDao;
|
||||
import com.peanut.modules.common.dao.ShopProductCourseDao;
|
||||
import com.peanut.modules.common.dao.ShopProductDao;
|
||||
import com.peanut.modules.common.entity.*;
|
||||
import com.peanut.modules.common.service.UserVipService;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
import com.peanut.modules.sociology.service.ShopProductService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -30,7 +31,9 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
|
||||
@Autowired
|
||||
private ShopProductBookDao shopProductBookDao;
|
||||
@Autowired
|
||||
private BookDao bookDao;
|
||||
private UserVipService userVipService;
|
||||
@Autowired
|
||||
private com.peanut.modules.book.service.ShopProductService shopProductService;
|
||||
|
||||
@Override
|
||||
public Page getMarketProductList(ParamTo param) {
|
||||
@@ -58,6 +61,9 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
|
||||
public Map<String, Object> getProductDetail(Integer productId) {
|
||||
ShopProduct product = this.getById(productId);
|
||||
HashMap<String, Object> flag = new HashMap<>();
|
||||
if (!userVipService.noVip()&&product.getIsVipPrice()==1){
|
||||
product.setVipPrice(shopProductService.getVipPrice(product));
|
||||
}
|
||||
flag.put("detail",product);//基础信息
|
||||
//查询包含的书
|
||||
MPJLambdaWrapper<ShopProductBookEntity> shopProductBookEntityMPJLambdaWrapper = new MPJLambdaWrapper<>();
|
||||
@@ -108,6 +114,16 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
|
||||
List<ShopProduct> shopProducts = this.getBaseMapper().selectList(new LambdaQueryWrapper<ShopProduct>().in(ShopProduct::getProductId, is));
|
||||
flag.put("GLProducts",shopProducts);
|
||||
}
|
||||
if (flag.containsKey("GLProducts")){
|
||||
List<ShopProduct> shopProducts = (List)flag.get("GLProducts");
|
||||
if (shopProducts.size()>0){
|
||||
for (ShopProduct shopProduct : shopProducts) {
|
||||
if (!userVipService.noVip()&&shopProduct.getIsVipPrice()==1){
|
||||
shopProduct.setVipPrice(shopProductService.getVipPrice(shopProduct));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user