Merge remote-tracking branch 'origin/zcc'
This commit is contained in:
@@ -3,8 +3,10 @@ package com.peanut.modules.master.controller;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.service.ShopProductBookService;
|
||||
import com.peanut.modules.common.entity.BookEntity;
|
||||
import com.peanut.modules.common.entity.ShopProduct;
|
||||
import com.peanut.modules.common.entity.ShopProductBookEntity;
|
||||
import com.peanut.modules.common.entity.ShopProductCourseEntity;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
import com.peanut.modules.common.vo.CourseCatalogueVo;
|
||||
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -53,6 +56,13 @@ public class ShopProductController {
|
||||
return R.ok().put("detail",detail);
|
||||
}
|
||||
|
||||
@RequestMapping("/addProduct")
|
||||
public R addProduct(@RequestBody ShopProduct shopProduct){
|
||||
shopProduct.setCreateTime(new Date());
|
||||
shopProductService.save(shopProduct);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@RequestMapping("/editProductDetail")
|
||||
public R editProductDetail(@RequestBody ShopProduct shopProduct){
|
||||
shopProductService.updateById(shopProduct);
|
||||
|
||||
Reference in New Issue
Block a user