diff --git a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java index 8f135380..23e0e580 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java @@ -132,7 +132,7 @@ public class BookLabelAndMarketController { }else { List labelList = labelService.list(new LambdaQueryWrapper().eq(ShopProductBookLabel::getPid,id)); if (labelList.size() > 0) { - return R.error("请先删除子集，设置成最后一集"); + return R.error("请先删除子集"); }else { labelService.removeById(id); return R.ok(); @@ -193,7 +193,7 @@ public class BookLabelAndMarketController { }else { List marketList = marketService.list(new LambdaQueryWrapper().eq(ShopProductBookMarket::getPid,id)); if (marketList.size() > 0) { - return R.error("请先删除子集，设置成最后一集"); + return R.error("请先删除子集"); }else { marketService.removeById(id); return R.ok(); diff --git a/src/main/java/com/peanut/modules/common/controller/MedicaldesController.java b/src/main/java/com/peanut/modules/common/controller/MedicaldesController.java new file mode 100644 index 00000000..48a73f04 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/controller/MedicaldesController.java @@ -0,0 +1,357 @@ +package com.peanut.modules.common.controller; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.*; +import com.peanut.modules.common.service.*; +import com.peanut.modules.sys.service.SysDictDataService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Slf4j +@RestController("commonMedicaldes") +@RequestMapping("common/medicaldes") +public class MedicaldesController { + + + @Autowired + private MedicaldesLightService lightService; + @Autowired + private MedicaldesBookService medicaldesBookService; + @Autowired + private MedicaldesInheritService inheritService; + @Autowired + private MedicaldesInheritRelationService relationService; + @Autowired + private SysDictDataService sysDictDataService; + @Autowired + private BookService bookService; + @Autowired + private StringRedisTemplate redisTemplate; + @Autowired + private ProvinceService provinceService; + @Autowired + private CityService cityService; + + + /** + * 类型列表 + */ + @RequestMapping(path = "/typeList") + public R typeList(String label) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,label); + return R.ok().put("result",sysDictDataService.list(wrapper)); + } + + /** + * 书列表 + */ + @RequestMapping(path = "/bookList") + public R bookList() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(BookEntity::getBookType,0); + wrapper.orderByDesc(BookEntity::getCreateTime); + return R.ok().put("result",bookService.list(wrapper)); + } + + /** + * 专著出版关系列表 + */ + @RequestMapping(path = "/bookRelationListByType") + public R bookRelationListByType(@RequestBody Map map) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.selectAll(MedicaldesBook.class); + wrapper.leftJoin(BookEntity.class,BookEntity::getId,MedicaldesBook::getBookId); + wrapper.eq(BookEntity::getBookType,0); + if (map.containsKey("dictType")&& StringUtils.isNotEmpty(map.get("dictType").toString())){ + wrapper.eq(MedicaldesBook::getTypeId,map.get("dictType")); + } + if (map.containsKey("bookName")&&StringUtils.isNotEmpty(map.get("bookName").toString())){ + wrapper.like(BookEntity::getName,map.get("bookName")); + } + wrapper.orderByAsc(MedicaldesBook::getSort); + Page res = medicaldesBookService.page(new Page( + Long.parseLong(map.get("current").toString()), Long.parseLong(map.get("limit").toString())), wrapper); + List list = res.getRecords(); + if (list.size() > 0) { + for (MedicaldesBook b : list) { + b.setBook(bookService.getById(b.getBookId())); + } + res.setRecords(list); + } + return R.ok().put("result", res); + } + + /** + * 专著出版列表 + */ + @RequestMapping(path = "/bookListByType") + public R bookListByType(String type) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.selectAll(BookEntity.class); + wrapper.leftJoin(MedicaldesBook.class,MedicaldesBook::getBookId,BookEntity::getId); + wrapper.eq(MedicaldesBook::getTypeId,type); + wrapper.eq(BookEntity::getBookType,0); + wrapper.orderByAsc(MedicaldesBook::getSort); + List list = bookService.list(wrapper); + return R.ok().put("result", list); + } + + @RequestMapping(path = "/saveOrUpdateBookRelation") + public R saveOrUpdateBookRelation(@RequestBody MedicaldesBook medicaldesBook) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(MedicaldesBook::getBookId,medicaldesBook.getBookId()); + wrapper.eq(MedicaldesBook::getTypeId,medicaldesBook.getTypeId()); + if (medicaldesBookService.getOne(wrapper)!=null){ + medicaldesBookService.remove(wrapper); + } + medicaldesBookService.saveOrUpdate(medicaldesBook); + return R.ok(); + } + + @RequestMapping(path = "/delBookRelation") + public R delBookRelation(String id) { + medicaldesBookService.removeById(id); + return R.ok(); + } + + /** + * 学术传承列表分页 + */ + @RequestMapping(path = "/inheritListByPage") + public R inheritListByPage(@RequestBody Map map) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.leftJoin(MedicaldesInheritRelation.class,MedicaldesInheritRelation::getInheritId,MedicaldesInherit::getId); + wrapper.leftJoin(City.class,City::getCityId,MedicaldesInherit::getCityId); + wrapper.leftJoin(Province.class,Province::getProvId,City::getProvId); + wrapper.selectAll(MedicaldesInherit.class); + if (map.containsKey("dictType")&&StringUtils.isNotEmpty(map.get("dictType").toString())){ + wrapper.eq(MedicaldesInheritRelation::getTypeId,map.get("dictType")); + } + if (map.containsKey("name")&&StringUtils.isNotEmpty(map.get("name").toString())){ + wrapper.like(MedicaldesInherit::getName,map.get("name")); + } + wrapper.selectAs(MedicaldesInheritRelation::getTypeId,"type"); + wrapper.selectAs(MedicaldesInheritRelation::getSort,"sort"); + wrapper.orderByAsc(MedicaldesInheritRelation::getSort); + Page page = inheritService.page(new Page<>( + Long.parseLong(map.get("current").toString()), Long.parseLong(map.get("limit").toString())),wrapper); + return R.ok().put("result", page); + } + + //国际医师可能来自国外在省市里加入外国 + public List getCounts() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(com.peanut.modules.book.entity.SysDictDataEntity::getDictLabel,"inheritPro"); + List dataList = sysDictDataService.list(wrapper); + return dataList; + } + + public List getCityList(String cityName,int countId) { + List cityList = new ArrayList<>(); + City city = new City(); + city.setProvId((long)countId); + city.setCityName(cityName); + city.setCityId((long)countId); + cityList.add(city); + return cityList; + } + + /** + * 学术传承列表按类型、地区 + */ + @RequestMapping(path = "/inheritListByTypeProvId") + public R inheritListByTypeProvId(String type,String provId) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.leftJoin(MedicaldesInheritRelation.class,MedicaldesInheritRelation::getInheritId,MedicaldesInherit::getId); + wrapper.eq(MedicaldesInheritRelation::getTypeId,type); + wrapper.leftJoin(City.class,City::getCityId,MedicaldesInherit::getCityId); + wrapper.leftJoin(Province.class,Province::getProvId,City::getProvId); + wrapper.selectAll(MedicaldesInherit.class); + if ("0".equals(provId)){ + int[] val = new int[] {0}; + //未知地址 + if (getCounts()!=null&&getCounts().size() > 0){ + for (int i=1;i<=getCounts().size(); i++){ + val[i] = i; + } + } + wrapper.in(MedicaldesInherit::getCityId,val); + }else { + wrapper.eq(Province::getProvId,provId); + } + wrapper.selectAs(MedicaldesInheritRelation::getSort,"sort"); + wrapper.orderByAsc(MedicaldesInheritRelation::getSort); + List list = inheritService.list(wrapper); + return R.ok().put("result", list); + } + + //获取地址 + @RequestMapping(path = "/getMedicaldesProList") + public R getMedicaldesProList() { + String s = redisTemplate.opsForValue().get("Province"); + List provinceList = new ArrayList<>(); + if (getCounts() != null&&getCounts().size() > 0){ + for (int i=0;i redisData = JSONArray.parseArray(s); + for (Object object : redisData) { + Province ret = JSONObject.parseObject(object.toString(), Province.class); + provinceList.add(ret); + } + return R.ok().put("provinceEntity", provinceList); + }else { + provinceList.addAll(provinceService.getCity()); + } + return R.ok().put("provinceEntity", provinceList); + } + + //获取市列表 + @RequestMapping(path = "/getCityByPro") + public R getCityByPro(@RequestParam("provId") Integer provId) { + List prov = new ArrayList<>(); + List list = getCounts(); + boolean flag = false; + if (list != null && list.size() > 0) { + for (com.peanut.modules.book.entity.SysDictDataEntity data:list) { + if (provId==Integer.parseInt(data.getDictType())){ + prov.addAll(getCityList(data.getDictValue(),Integer.parseInt(data.getDictType()))); + flag = true; + } + } + } + if (!flag) { + prov = cityService.getBaseMapper().selectList(new QueryWrapper() + .eq("prov_id", provId)); + } + return R.ok().put("prov", prov); + } + + @RequestMapping(path = "/getInheritById") + public R getInheritById(String id) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(MedicaldesInherit::getId,id); + wrapper.leftJoin(MedicaldesInheritRelation.class,MedicaldesInheritRelation::getInheritId,MedicaldesInherit::getId); + wrapper.leftJoin(City.class,City::getCityId,MedicaldesInherit::getCityId); + wrapper.leftJoin(Province.class,Province::getProvId,City::getProvId); + wrapper.leftJoin(" (select dict_type,dict_value from sys_dict_data where dict_label = 'inheritPro') dd on dd.dict_type = t.city_id"); + wrapper.select("t.*,ifnull(t2.city_name,ifnull(dd.dict_value,'其他')) as city_name,ifnull(t3.prov_name,ifnull(dd.dict_value,'其他')) as prov_name,t1.sort as sort"); + Map inherit = inheritService.getMap(wrapper); + return R.ok().put("result",inherit); + } + + @RequestMapping(path = "/saveOrUpdateInherit") + public R addInherit(@RequestBody MedicaldesInherit inherit) { + MedicaldesInheritRelation relation = null; + if (inherit.getId()==null) { + relation = new MedicaldesInheritRelation(); + }else { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(MedicaldesInheritRelation::getInheritId,inherit.getId()); + relation = relationService.getOne(wrapper); + } + inheritService.saveOrUpdate(inherit); + relation.setTypeId(inherit.getType()); + relation.setInheritId(inherit.getId()); + relation.setSort(inherit.getSort()); + relationService.saveOrUpdate(relation); + return R.ok(); + } + + @RequestMapping(path = "/delInherit") + public R delInherit(String id) { + inheritService.removeById(id); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(MedicaldesInheritRelation::getInheritId,id); + relationService.removeById(relationService.getOne(wrapper)); + return R.ok(); + } + + @RequestMapping(path = "/getList") + public List> getList(String type) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.select("count(1) count,ifnull(t3.prov_id,ifnull(dd.dict_type,'0')) AS prov_id,ifnull(t3.prov_name,ifnull(dd.dict_value,'其他')) AS prov_name "); + wrapper.leftJoin(MedicaldesInheritRelation.class,MedicaldesInheritRelation::getInheritId,MedicaldesInherit::getId); + wrapper.eq(MedicaldesInheritRelation::getTypeId,type); + wrapper.leftJoin(City.class,City::getCityId,MedicaldesInherit::getCityId); + wrapper.leftJoin(Province.class,Province::getProvId,City::getProvId); + wrapper.leftJoin(" (select dict_type,dict_value from sys_dict_data where dict_label = 'inheritPro') dd on dd.dict_type = t.city_id"); + wrapper.groupBy("prov_name","dict_value"); + wrapper.orderByAsc("t3.region_code","dict_value"); + List> list = inheritService.listMaps(wrapper); + return list; + } + + /** + * 吴门之光列表 + */ + @RequestMapping(path = "/lightListByType") + public R lightListByType(String type) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + if (StringUtils.isNotEmpty(type)){ + wrapper.eq(MedicaldesLight::getType,type); + } + wrapper.orderByAsc(MedicaldesLight::getSort); + List list = lightService.list(wrapper); + return R.ok().put("result", list); + } + + /** + * 吴门之光列表 + */ + @RequestMapping(path = "/lightListByPage") + public R lightListByPage(@RequestBody Map map) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + if (map.containsKey("type")&&StringUtils.isNotEmpty(map.get("type").toString())){ + wrapper.eq(MedicaldesLight::getType,map.get("type")); + } + if (map.containsKey("name")&&StringUtils.isNotEmpty(map.get("name").toString())){ + wrapper.like(MedicaldesLight::getName,map.get("name")); + } + wrapper.orderByAsc(MedicaldesLight::getSort); + Page page = lightService.page(new Page<>( + Long.parseLong(map.get("current").toString()), Long.parseLong(map.get("limit").toString())),wrapper); + return R.ok().put("result", page); + } + + @RequestMapping(path = "/getLightById") + public R getLightById(String id) { + return R.ok().put("result",lightService.getById(id)); + } + + @RequestMapping(path = "/saveOrUpdateLight") + public R addLight(@RequestBody MedicaldesLight light) { + lightService.saveOrUpdate(light); + return R.ok(); + } + + @RequestMapping(path = "/delLight") + public R delLight(String id) { + lightService.removeById(id); + return R.ok(); + } + + +} diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductMedicineLabelDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductMedicineLabelDao.java new file mode 100644 index 00000000..cc9aed3e --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductMedicineLabelDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.common.entity.ShopProductMedicineLabel; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShopProductMedicineLabelDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductMedicineMarketDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductMedicineMarketDao.java new file mode 100644 index 00000000..c110cc37 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductMedicineMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.common.entity.ShopProductMedicineMarket; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShopProductMedicineMarketDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductSociologyLabelDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductSociologyLabelDao.java new file mode 100644 index 00000000..a821fd5b --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductSociologyLabelDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.common.entity.ShopProductSociologyLabel; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShopProductSociologyLabelDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductSociologyMarketDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductSociologyMarketDao.java new file mode 100644 index 00000000..23217ae9 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductSociologyMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.common.entity.ShopProductSociologyMarket; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShopProductSociologyMarketDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductToMedicineLabelDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductToMedicineLabelDao.java new file mode 100644 index 00000000..08897bdc --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductToMedicineLabelDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.common.entity.ShopProductToMedicineLabel; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShopProductToMedicineLabelDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductToMedicineMarketDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductToMedicineMarketDao.java new file mode 100644 index 00000000..d247f04a --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductToMedicineMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.common.entity.ShopProductToMedicineMarket; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShopProductToMedicineMarketDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductToSociologyLabelDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductToSociologyLabelDao.java new file mode 100644 index 00000000..e8b254f5 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductToSociologyLabelDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.common.entity.ShopProductToSociologyLabel; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShopProductToSociologyLabelDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/ShopProductToSociologyMarketDao.java b/src/main/java/com/peanut/modules/common/dao/ShopProductToSociologyMarketDao.java new file mode 100644 index 00000000..560b7b4d --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/ShopProductToSociologyMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.common.entity.ShopProductToSociologyMarket; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShopProductToSociologyMarketDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductMedicineLabel.java b/src/main/java/com/peanut/modules/common/entity/ShopProductMedicineLabel.java new file mode 100644 index 00000000..57c66e79 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductMedicineLabel.java @@ -0,0 +1,52 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@TableName("shop_product_medicine_label") +public class ShopProductMedicineLabel implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Integer id; + + /** + * 父id + */ + private Integer pid; + + /** + * 标题 + */ + private String title; + + /** + * 0否1是 + */ + private Integer isLast; + + /** + * 权重 + */ + private Integer sort; + + /** + * 创建时间 + */ + private Date createTime; + + @TableLogic + private Integer delFlag; + + @TableField(exist = false) + private List children; + +} diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductMedicineMarket.java b/src/main/java/com/peanut/modules/common/entity/ShopProductMedicineMarket.java new file mode 100644 index 00000000..61511a11 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductMedicineMarket.java @@ -0,0 +1,52 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@TableName("shop_product_medicine_market") +public class ShopProductMedicineMarket implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Integer id; + + /** + * 父id + */ + private Integer pid; + + /** + * 标题 + */ + private String title; + + /** + * 0否1是 + */ + private Integer isLast; + + /** + * 权重 + */ + private Integer sort; + + /** + * 创建时间 + */ + private Date createTime; + + @TableLogic + private Integer delFlag; + + @TableField(exist = false) + private List children; + +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductSociologyLabel.java b/src/main/java/com/peanut/modules/common/entity/ShopProductSociologyLabel.java new file mode 100644 index 00000000..68b15ae0 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductSociologyLabel.java @@ -0,0 +1,51 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@TableName("shop_product_sociology_label") +public class ShopProductSociologyLabel implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Integer id; + + /** + * 父id + */ + private Integer pid; + + /** + * 标题 + */ + private String title; + + /** + * 0否1是 + */ + private Integer isLast; + + /** + * 权重 + */ + private Integer sort; + + /** + * 创建时间 + */ + private Date createTime; + + @TableLogic + private Integer delFlag; + + @TableField(exist = false) + private List children; + +} diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductSociologyMarket.java b/src/main/java/com/peanut/modules/common/entity/ShopProductSociologyMarket.java new file mode 100644 index 00000000..129edaed --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductSociologyMarket.java @@ -0,0 +1,51 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@TableName("shop_product_sociology_market") +public class ShopProductSociologyMarket implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Integer id; + + /** + * 父id + */ + private Integer pid; + + /** + * 标题 + */ + private String title; + + /** + * 0否1是 + */ + private Integer isLast; + + /** + * 权重 + */ + private Integer sort; + + /** + * 创建时间 + */ + private Date createTime; + + @TableLogic + private Integer delFlag; + + @TableField(exist = false) + private List children; + +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineLabel.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineLabel.java new file mode 100644 index 00000000..ba78a5a7 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineLabel.java @@ -0,0 +1,40 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("shop_product_to_medicine_label") +public class ShopProductToMedicineLabel implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Integer id; + + private Integer productId; + + private Integer medicineLabelId; + + /** + * 创建时间 + */ + private Date createTime; + + @TableLogic + private Integer delFlag; + + @TableField(exist = false) + private ShopProduct product; + @TableField(exist = false) + private ShopProductToMedicineLabel label; + + + + +} diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineMarket.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineMarket.java new file mode 100644 index 00000000..387fac1b --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineMarket.java @@ -0,0 +1,40 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("shop_product_to_medicine_market") +public class ShopProductToMedicineMarket implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Integer id; + + private Integer productId; + + private Integer medicineMarketId; + + /** + * 创建时间 + */ + private Date createTime; + + @TableLogic + private Integer delFlag; + + @TableField(exist = false) + private ShopProduct product; + @TableField(exist = false) + private ShopProductToMedicineMarket market; + + + + +} diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyLabel.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyLabel.java new file mode 100644 index 00000000..3a36e6b8 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyLabel.java @@ -0,0 +1,39 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("shop_product_to_sociology_label") +public class ShopProductToSociologyLabel implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Integer id; + + private Integer productId; + + private Integer sociologyLabelId; + + /** + * 创建时间 + */ + private Date createTime; + + @TableLogic + private Integer delFlag; + + @TableField(exist = false) + private ShopProduct product; + @TableField(exist = false) + private ShopProductSociologyLabel label; + + + + +} diff --git a/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyMarket.java b/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyMarket.java new file mode 100644 index 00000000..28db30c4 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/entity/ShopProductToSociologyMarket.java @@ -0,0 +1,39 @@ +package com.peanut.modules.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("shop_product_to_sociology_market") +public class ShopProductToSociologyMarket implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + private Integer id; + + private Integer productId; + + private Integer sociologyMarketId; + + /** + * 创建时间 + */ + private Date createTime; + + @TableLogic + private Integer delFlag; + + @TableField(exist = false) + private ShopProduct product; + @TableField(exist = false) + private ShopProductSociologyMarket market; + + + + +} diff --git a/src/main/java/com/peanut/modules/common/service/BookService.java b/src/main/java/com/peanut/modules/common/service/BookService.java new file mode 100644 index 00000000..d4f5c7af --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/BookService.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.BookEntity; + +public interface BookService extends IService { + +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/common/service/MedicaldesBookService.java b/src/main/java/com/peanut/modules/common/service/MedicaldesBookService.java new file mode 100644 index 00000000..a950849e --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/MedicaldesBookService.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.MedicaldesBook; +import org.springframework.stereotype.Service; + +@Service +public interface MedicaldesBookService extends IService { +} diff --git a/src/main/java/com/peanut/modules/common/service/MedicaldesInheritRelationService.java b/src/main/java/com/peanut/modules/common/service/MedicaldesInheritRelationService.java new file mode 100644 index 00000000..2bb457fd --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/MedicaldesInheritRelationService.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.MedicaldesInheritRelation; +import org.springframework.stereotype.Service; + +@Service +public interface MedicaldesInheritRelationService extends IService { +} diff --git a/src/main/java/com/peanut/modules/common/service/MedicaldesInheritService.java b/src/main/java/com/peanut/modules/common/service/MedicaldesInheritService.java new file mode 100644 index 00000000..298d9e2b --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/MedicaldesInheritService.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.MedicaldesInherit; +import org.springframework.stereotype.Service; + +@Service +public interface MedicaldesInheritService extends IService { +} diff --git a/src/main/java/com/peanut/modules/common/service/MedicaldesLightService.java b/src/main/java/com/peanut/modules/common/service/MedicaldesLightService.java new file mode 100644 index 00000000..8e689d87 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/MedicaldesLightService.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.MedicaldesLight; +import org.springframework.stereotype.Service; + +@Service +public interface MedicaldesLightService extends IService { +} diff --git a/src/main/java/com/peanut/modules/common/service/impl/BookServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/BookServiceImpl.java new file mode 100644 index 00000000..02b99928 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/impl/BookServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.BookDao; +import com.peanut.modules.common.entity.BookEntity; +import com.peanut.modules.common.service.BookService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("commonBookService") +public class BookServiceImpl extends ServiceImpl implements BookService { +} diff --git a/src/main/java/com/peanut/modules/common/service/impl/MedicaldesBookServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/MedicaldesBookServiceImpl.java new file mode 100644 index 00000000..1f42e19c --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/impl/MedicaldesBookServiceImpl.java @@ -0,0 +1,12 @@ +package com.peanut.modules.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.MedicaldesBookDao; +import com.peanut.modules.common.entity.MedicaldesBook; +import com.peanut.modules.common.service.MedicaldesBookService; +import org.springframework.stereotype.Service; + +@Service("commonMedicaldesBookService") +public class MedicaldesBookServiceImpl extends ServiceImpl implements MedicaldesBookService { +} + diff --git a/src/main/java/com/peanut/modules/common/service/impl/MedicaldesInheritRelationServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/MedicaldesInheritRelationServiceImpl.java new file mode 100644 index 00000000..cacb3d5f --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/impl/MedicaldesInheritRelationServiceImpl.java @@ -0,0 +1,11 @@ +package com.peanut.modules.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.MedicaldesInheritRelationDao; +import com.peanut.modules.common.entity.MedicaldesInheritRelation; +import com.peanut.modules.common.service.MedicaldesInheritRelationService; +import org.springframework.stereotype.Service; + +@Service("commonMedicaldesInheritRelationService") +public class MedicaldesInheritRelationServiceImpl extends ServiceImpl implements MedicaldesInheritRelationService { +} diff --git a/src/main/java/com/peanut/modules/common/service/impl/MedicaldesInheritServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/MedicaldesInheritServiceImpl.java new file mode 100644 index 00000000..0468d246 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/impl/MedicaldesInheritServiceImpl.java @@ -0,0 +1,11 @@ +package com.peanut.modules.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.MedicaldesInheritDao; +import com.peanut.modules.common.entity.MedicaldesInherit; +import com.peanut.modules.common.service.MedicaldesInheritService; +import org.springframework.stereotype.Service; + +@Service("commonMedicaldesInheritService") +public class MedicaldesInheritServiceImpl extends ServiceImpl implements MedicaldesInheritService { +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/common/service/impl/MedicaldesLightServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/MedicaldesLightServiceImpl.java new file mode 100644 index 00000000..4d76a471 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/impl/MedicaldesLightServiceImpl.java @@ -0,0 +1,12 @@ +package com.peanut.modules.common.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.MedicaldesLightDao; +import com.peanut.modules.common.entity.MedicaldesLight; +import com.peanut.modules.common.service.MedicaldesLightService; +import org.springframework.stereotype.Service; + +@Service("commonMedicaldesLightService") +public class MedicaldesLightServiceImpl extends ServiceImpl implements MedicaldesLightService { +} diff --git a/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java b/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java new file mode 100644 index 00000000..6bfd8c0f --- /dev/null +++ b/src/main/java/com/peanut/modules/master/controller/MedicineLabelAndMarketController.java @@ -0,0 +1,4 @@ +package com.peanut.modules.master.controller; + +public class MedicineLabelAndMarketController { +} diff --git a/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java b/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java new file mode 100644 index 00000000..38ea93a1 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/controller/SociologyLabelAndMarketController.java @@ -0,0 +1,359 @@ +package com.peanut.modules.master.controller; + +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.*; +import com.peanut.modules.master.service.*; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + +/** + * 众妙之门国学商品标签、营销标签管理 + */ +@Slf4j +@RestController("masterSociologyLabelAndMarket") +@RequestMapping("master/sociologyLabelAndMarket") +public class SociologyLabelAndMarketController { + + @Autowired + private ShopProductSociologyLabelService labelService; + @Autowired + private ShopProductSociologyMarketService marketService; + @Autowired + private ShopProductToSociologyLabelService toLabelService; + @Autowired + private ShopProductToSociologyMarketService toMarketService; + @Autowired + private ShopProductService productService; + + /** + * 标签树 + */ + @RequestMapping(path = "/labelTree") + public R labelTree() { + List labelsTree = labelService.labelTree(); + return R.ok().put("result", labelsTree); + } + + /** + * 获取标签列表 + */ + @RequestMapping(path = "/getLabelListByPid") + public R getLabelListByPid(String pid) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(ShopProductSociologyLabel::getPid,pid); + wrapper.orderByAsc(ShopProductSociologyLabel::getSort); + wrapper.orderByAsc(ShopProductSociologyLabel::getCreateTime); + List labelTopList = labelService.list(wrapper); + return R.ok().put("result", labelTopList); + } + + + /** + * 营销标签树 + */ + @RequestMapping(path = "/marketTree") + public R marketTree() { + List marketsTree = marketService.marketTree(); + return R.ok().put("result", marketsTree); + } + + /** + * 获取营销标签列表 + */ + @RequestMapping(path = "/getMakertListByPid") + public R getMakertListByPid(String pid) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(ShopProductSociologyMarket::getPid,pid); + wrapper.orderByAsc(ShopProductSociologyMarket::getSort); + wrapper.orderByAsc(ShopProductSociologyMarket::getCreateTime); + List marketTopList = marketService.list(wrapper); + return R.ok().put("result", marketTopList); + } + + @RequestMapping(path = "/getLabelById") + public R getLabelById(String id) { + return R.ok().put("result",labelService.getById(id)); + } + + @RequestMapping(path = "/saveOrUpdateLabel") + public R saveOrUpdateLabel(@RequestBody ShopProductSociologyLabel label) { + if (label.getId()==null){ + if(label.getPid()==0){ + labelService.save(label); + return R.ok().put("result",label); + }else { + ShopProductSociologyLabel l = labelService.getById(label.getPid()); + if (l.getIsLast()==1){ + return R.error("请将父标签设置为非最后一集"); + }else { + labelService.save(label); + return R.ok().put("result",label); + } + } + }else { + if (label.getIsLast() == 1){ + List llast = labelService.list(new LambdaQueryWrapper() + .eq(ShopProductSociologyLabel::getPid,label.getId())); + if (llast.size()>0){ + return R.error("请先删除子集，再设置为最后一集"); + }else { + labelService.saveOrUpdate(label); + return R.ok().put("result",label); + } + }else { + labelService.saveOrUpdate(label); + return R.ok().put("result",label); + } + } + } + + @RequestMapping(path = "/delLabel") + public R delLabel(String id) { + ShopProductSociologyLabel label = labelService.getById(id); + if (label.getIsLast()==1){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(ShopProductToSociologyLabel::getSociologyLabelId,id); + List tolables = toLabelService.list(wrapper); + if (tolables.size()>0){ + return R.error("请先移除商品"); + }else { + labelService.removeById(id); + return R.ok(); + } + }else { + List labelList = labelService.list(new LambdaQueryWrapper().eq(ShopProductSociologyLabel::getPid,id)); + if (labelList.size() > 0) { + return R.error("请先删除子集"); + }else { + labelService.removeById(id); + return R.ok(); + } + } + } + + @RequestMapping(path = "/getMarketById") + public R getMarketById(String id) { + return R.ok().put("result",marketService.getById(id)); + } + + @RequestMapping(path = "/saveOrUpdateMarket") + public R saveOrUpdateMarket(@RequestBody ShopProductSociologyMarket market) { + if (market.getId()==null){ + if(market.getPid()==0){ + marketService.save(market); + return R.ok().put("result",market); + }else { + ShopProductSociologyMarket m = marketService.getById(market.getPid()); + if (m.getIsLast()==1){ + return R.error("请将父标签设置为非最后一集"); + }else { + marketService.save(market); + return R.ok().put("result",market); + } + } + }else { + if (market.getIsLast() == 1){ + List mList = marketService.list(new LambdaQueryWrapper() + .eq(ShopProductSociologyMarket::getPid,market.getId())); + if (mList.size()>0){ + return R.error("请先删除子集，再设置为最后一集"); + }else { + marketService.saveOrUpdate(market); + return R.ok().put("result",market); + } + }else { + marketService.saveOrUpdate(market); + return R.ok().put("result",market); + } + } + } + + @RequestMapping(path = "/delMarket") + public R delMarket(String id) { + ShopProductSociologyMarket market = marketService.getById(id); + if (market.getIsLast()==1){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(ShopProductToSociologyMarket::getSociologyMarketId,id); + List tomarkets = toMarketService.list(wrapper); + if (tomarkets.size()>0){ + return R.error("请先移除商品"); + }else { + marketService.removeById(id); + return R.ok(); + } + }else { + List marketList = marketService.list(new LambdaQueryWrapper().eq(ShopProductSociologyMarket::getPid,id)); + if (marketList.size() > 0) { + return R.error("请先删除子集"); + }else { + marketService.removeById(id); + return R.ok(); + } + } + } + + /** + * 获取未关联商品列表 + */ + @RequestMapping("/getNotToLabelList") + public R getNotToLabelList(@RequestBody Map params){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + if (params.containsKey("goodsType")&&!"".equals(params.get("goodsType").toString())){ + wrapper.eq(ShopProduct::getGoodsType,params.get("goodsType").toString()); + } + if (params.containsKey("productName")&&!"".equals(params.get("productName").toString())){ + wrapper.like(ShopProduct::getProductName,params.get("productName").toString()); + } + if (params.containsKey("sociologyLabelId")&&!"".equals(params.get("sociologyLabelId").toString())){ + String sql = "select product_id from shop_product_to_sociology_label where del_flag = 0 and sociology_label_id = "+params.get("sociologyLabelId"); + wrapper.notInSql(ShopProduct::getProductId,sql); + } + if (params.containsKey("bookMarketId")&&!"".equals(params.get("bookMarketId").toString())){ + String sql = "select product_id from shop_product_to_sociology_market where del_flag = 0 and sociology_market_id = "+params.get("sociologyMarketId"); + wrapper.notInSql(ShopProduct::getProductId,sql); + } + Page page = productService.page(new Page<>( + Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); + return R.ok().put("result", page); + } + + /** + * 获取书标签列表 + */ + @RequestMapping("/getToLabelList") + public R getToLabelList(@RequestBody Map params){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.selectAll(ShopProductToSociologyLabel.class); + wrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopProductToSociologyLabel::getProductId); + if (params.containsKey("productName")&&!"".equals(params.get("productName").toString())){ + wrapper.like(ShopProduct::getProductName,params.get("productName").toString()); + } + if (params.containsKey("goodsType")&&!"".equals(params.get("goodsType").toString())){ + wrapper.eq(ShopProduct::getGoodsType,params.get("goodsType").toString()); + } + if (params.containsKey("productId")&&!"".equals(params.get("productId").toString())){ + wrapper.eq(ShopProductToSociologyLabel::getProductId,params.get("productId").toString()); + } + if (params.containsKey("sociologyLabelId")&&!"".equals(params.get("sociologyLabelId").toString())){ + wrapper.eq(ShopProductToSociologyLabel::getSociologyLabelId,params.get("sociologyLabelId").toString()); + } + Page page = toLabelService.page(new Page<>( + Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); + List res = page.getRecords(); + if (res.size() > 0) { + for (ShopProductToSociologyLabel item : res) { + item.setProduct(productService.getById(item.getProductId())); + item.setLabel(labelService.getById(item.getSociologyLabelId())); + } + } + page.setRecords(res); + return R.ok().put("result", page); + } + + /** + * 获取营销标签列表 + */ + @RequestMapping("/getToMarketList") + public R getToMarketList(@RequestBody Map params){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.selectAll(ShopProductToSociologyMarket.class); + wrapper.leftJoin(ShopProduct.class,ShopProduct::getProductId,ShopProductToSociologyMarket::getProductId); + if (params.containsKey("productName")&&!"".equals(params.get("productName").toString())){ + wrapper.like(ShopProduct::getProductName,params.get("productName").toString()); + } + if (params.containsKey("goodsType")&&!"".equals(params.get("goodsType").toString())){ + wrapper.eq(ShopProduct::getGoodsType,params.get("goodsType").toString()); + } + if (params.containsKey("productId")&&!"".equals(params.get("productId").toString())){ + wrapper.eq(ShopProductToBookMarket::getProductId,params.get("productId").toString()); + } + if (params.containsKey("sociologyMarketId")&&!"".equals(params.get("sociologyMarketId").toString())){ + wrapper.eq(ShopProductToSociologyMarket::getSociologyMarketId,params.get("sociologyMarketId").toString()); + } + Page page = toMarketService.page(new Page<>( + Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); + List res = page.getRecords(); + if (res.size() > 0) { + for (ShopProductToSociologyMarket item : res) { + item.setProduct(productService.getById(item.getProductId())); + item.setMarket(marketService.getById(item.getSociologyMarketId())); + } + } + page.setRecords(res); + return R.ok().put("result", page); + } + + @RequestMapping(path = "/saveToLabel") + public R saveToLabel(@RequestBody Map params) { + if (!StringUtils.isEmpty(params.get("productId").toString())){ + String[] ids = params.get("productId").toString().split(","); + if (ids.length > 0) { + for (String id : ids) { + ShopProductToSociologyLabel toLabel = new ShopProductToSociologyLabel(); + toLabel.setSociologyLabelId(Integer.parseInt(params.get("sociologyLabelId").toString())); + toLabel.setProductId(Integer.parseInt(id)); + toLabelService.save(toLabel); + } + } + } + return R.ok(); + } + + @RequestMapping(path = "/saveToMarket") + public R saveToMarket(@RequestBody Map params) { + if (!StringUtils.isEmpty(params.get("productId").toString())){ + String[] ids = params.get("productId").toString().split(","); + if (ids.length > 0) { + for (String id : ids) { + ShopProductToSociologyMarket toMarket = new ShopProductToSociologyMarket(); + toMarket.setSociologyMarketId(Integer.parseInt(params.get("sociologyMarketId").toString())); + toMarket.setProductId(Integer.parseInt(id)); + toMarketService.save(toMarket); + } + } + } + return R.ok(); + } + + @RequestMapping(path = "/delToLable") + public R delToLable(String lableId,String productId) { + if(StringUtils.isNotEmpty(productId)){ + String[] productIds = productId.split(","); + for(String id : productIds){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(ShopProductToSociologyLabel::getSociologyLabelId,lableId); + wrapper.eq(ShopProductToSociologyLabel::getProductId,id); + toLabelService.remove(wrapper); + } + } + return R.ok(); + } + + @RequestMapping(path = "/delToMarket") + public R delToMarket(String marketId,String productId) { + if(StringUtils.isNotEmpty(productId)){ + String[] productIds = productId.split(","); + for(String id : productIds){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(ShopProductToSociologyMarket::getSociologyMarketId,marketId); + wrapper.eq(ShopProductToSociologyMarket::getProductId,id); + toMarketService.remove(wrapper); + } + } + return R.ok(); + } + + + + + +} diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductMedicineLabelService.java b/src/main/java/com/peanut/modules/master/service/ShopProductMedicineLabelService.java new file mode 100644 index 00000000..26f5ad25 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/ShopProductMedicineLabelService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductMedicineLabel; + +public interface ShopProductMedicineLabelService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductMedicineMarketService.java b/src/main/java/com/peanut/modules/master/service/ShopProductMedicineMarketService.java new file mode 100644 index 00000000..5cabb18a --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/ShopProductMedicineMarketService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductMedicineMarket; + +public interface ShopProductMedicineMarketService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductSociologyLabelService.java b/src/main/java/com/peanut/modules/master/service/ShopProductSociologyLabelService.java new file mode 100644 index 00000000..9168c0b4 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/ShopProductSociologyLabelService.java @@ -0,0 +1,12 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductSociologyLabel; + +import java.util.List; + +public interface ShopProductSociologyLabelService extends IService { + + List labelTree(); + +} diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductSociologyMarketService.java b/src/main/java/com/peanut/modules/master/service/ShopProductSociologyMarketService.java new file mode 100644 index 00000000..ff61c048 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/ShopProductSociologyMarketService.java @@ -0,0 +1,12 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductSociologyMarket; + +import java.util.List; + +public interface ShopProductSociologyMarketService extends IService { + + List marketTree(); + +} diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductToMedicineLabelService.java b/src/main/java/com/peanut/modules/master/service/ShopProductToMedicineLabelService.java new file mode 100644 index 00000000..ac901d79 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/ShopProductToMedicineLabelService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductToMedicineLabel; + +public interface ShopProductToMedicineLabelService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductToMedicineMarketService.java b/src/main/java/com/peanut/modules/master/service/ShopProductToMedicineMarketService.java new file mode 100644 index 00000000..4c0d5b9c --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/ShopProductToMedicineMarketService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductToMedicineMarket; + +public interface ShopProductToMedicineMarketService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyLabelService.java b/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyLabelService.java new file mode 100644 index 00000000..71393027 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyLabelService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductToSociologyLabel; + +public interface ShopProductToSociologyLabelService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyMarketService.java b/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyMarketService.java new file mode 100644 index 00000000..32a9aa8a --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/ShopProductToSociologyMarketService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductToSociologyMarket; + +public interface ShopProductToSociologyMarketService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineLabelServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineLabelServiceImpl.java new file mode 100644 index 00000000..670267b4 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineLabelServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductMedicineLabelDao; +import com.peanut.modules.common.entity.ShopProductMedicineLabel; +import com.peanut.modules.medical.service.ShopProductMedicineLabelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("medicineShopProductMedicineLabelService") +public class ShopProductMedicineLabelServiceImpl extends ServiceImpl implements ShopProductMedicineLabelService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineMarketServiceImpl.java new file mode 100644 index 00000000..d4b06879 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineMarketServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductMedicineMarketDao; +import com.peanut.modules.common.entity.ShopProductMedicineMarket; +import com.peanut.modules.medical.service.ShopProductMedicineMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("medicineShopProductMedicineMarketService") +public class ShopProductMedicineMarketServiceImpl extends ServiceImpl implements ShopProductMedicineMarketService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyLabelServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyLabelServiceImpl.java new file mode 100644 index 00000000..0845315f --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyLabelServiceImpl.java @@ -0,0 +1,46 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductSociologyLabelDao; +import com.peanut.modules.common.entity.ShopProductSociologyLabel; +import com.peanut.modules.master.service.ShopProductSociologyLabelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Service("sociologyShopProductSociologyLabelService") +public class ShopProductSociologyLabelServiceImpl extends ServiceImpl implements ShopProductSociologyLabelService { + + @Autowired + private ShopProductSociologyLabelDao labelDao; + + @Override + public List labelTree() { + List labels = labelDao.selectList(new QueryWrapper<>()); + List labelsTree = labels.stream().filter((shopProductSociologyLabel) -> + shopProductSociologyLabel.getPid() == 0 + ).map((label)->{ + label.setChildren(getLabelChildrens(label,labels)); + return label; + }).sorted((label1,label2)->{ + return (label1.getSort() == null? 0 : label1.getSort()) - (label2.getSort()==null?0:label2.getSort()); + }).collect(Collectors.toList()); + return labelsTree; + } + + private List getLabelChildrens(ShopProductSociologyLabel root,List all){ + List children = all.stream().filter(shopProductSociologyLabel -> { + return root.getId().equals(shopProductSociologyLabel.getPid()); + }).map(shopProductSociologyLabel -> { + shopProductSociologyLabel.setChildren(getLabelChildrens(shopProductSociologyLabel, all)); + return shopProductSociologyLabel; + }).sorted((label1,label2)->{ + return (label1.getSort()==null?0:label1.getSort()) - (label2.getSort()==null?0:label2.getSort()); + }).collect(Collectors.toList()); + return children; + } +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyMarketServiceImpl.java new file mode 100644 index 00000000..9a14622c --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyMarketServiceImpl.java @@ -0,0 +1,46 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductSociologyMarketDao; +import com.peanut.modules.common.entity.ShopProductSociologyMarket; +import com.peanut.modules.master.service.ShopProductSociologyMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Service("sociologyShopProductSociologyMarketService") +public class ShopProductSociologyMarketServiceImpl extends ServiceImpl implements ShopProductSociologyMarketService { + + @Autowired + private ShopProductSociologyMarketDao marketDao; + + @Override + public List marketTree() { + List markets = marketDao.selectList(new QueryWrapper<>()); + List marketsTree = markets.stream().filter((shopProductSociologyMarket) -> + shopProductSociologyMarket.getPid() == 0 + ).map((market)->{ + market.setChildren(getMarketChildrens(market,markets)); + return market; + }).sorted((sort1,sort2)->{ + return (sort1.getSort() == null? 0 : sort1.getSort()) - (sort2.getSort()==null?0:sort2.getSort()); + }).collect(Collectors.toList()); + return marketsTree; + } + + private List getMarketChildrens(ShopProductSociologyMarket root,List all){ + List children = all.stream().filter(shopProductSociologyMarket -> { + return root.getId().equals(shopProductSociologyMarket.getPid()); + }).map(shopProductSociologyMarket -> { + shopProductSociologyMarket.setChildren(getMarketChildrens(shopProductSociologyMarket, all)); + return shopProductSociologyMarket; + }).sorted((sort1,sort2)->{ + return (sort1.getSort()==null?0:sort1.getSort()) - (sort2.getSort()==null?0:sort2.getSort()); + }).collect(Collectors.toList()); + return children; + } +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineLabelServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineLabelServiceImpl.java new file mode 100644 index 00000000..81e16dc1 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineLabelServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductToMedicineLabelDao; +import com.peanut.modules.common.entity.ShopProductToMedicineLabel; +import com.peanut.modules.medical.service.ShopProductToMedicineLabelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("medicineShopProductToMedicineLabelService") +public class ShopProductToMedicineLabelServiceImpl extends ServiceImpl implements ShopProductToMedicineLabelService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineMarketServiceImpl.java new file mode 100644 index 00000000..300b8d0d --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineMarketServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductToMedicineMarketDao; +import com.peanut.modules.common.entity.ShopProductToMedicineMarket; +import com.peanut.modules.medical.service.ShopProductToMedicineMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("medicineShopProductToMedicineMarketService") +public class ShopProductToMedicineMarketServiceImpl extends ServiceImpl implements ShopProductToMedicineMarketService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyLabelServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyLabelServiceImpl.java new file mode 100644 index 00000000..77df5dff --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyLabelServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductToSociologyLabelDao; +import com.peanut.modules.common.entity.ShopProductToSociologyLabel; +import com.peanut.modules.master.service.ShopProductToSociologyLabelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("sociologyShopProductToSociologyLabelService") +public class ShopProductToSociologyLabelServiceImpl extends ServiceImpl implements ShopProductToSociologyLabelService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java new file mode 100644 index 00000000..7cda9ba8 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductToSociologyMarketDao; +import com.peanut.modules.common.entity.ShopProductToSociologyMarket; +import com.peanut.modules.master.service.ShopProductToSociologyMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("sociologyShopProductToSociologyMarketService") +public class ShopProductToSociologyMarketServiceImpl extends ServiceImpl implements ShopProductToSociologyMarketService { +} diff --git a/src/main/java/com/peanut/modules/medical/service/ShopProductMedicineLabelService.java b/src/main/java/com/peanut/modules/medical/service/ShopProductMedicineLabelService.java new file mode 100644 index 00000000..6ec7ebda --- /dev/null +++ b/src/main/java/com/peanut/modules/medical/service/ShopProductMedicineLabelService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.medical.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductMedicineLabel; + +public interface ShopProductMedicineLabelService extends IService { +} diff --git a/src/main/java/com/peanut/modules/medical/service/ShopProductMedicineMarketService.java b/src/main/java/com/peanut/modules/medical/service/ShopProductMedicineMarketService.java new file mode 100644 index 00000000..fa96176c --- /dev/null +++ b/src/main/java/com/peanut/modules/medical/service/ShopProductMedicineMarketService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.medical.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductMedicineMarket; + +public interface ShopProductMedicineMarketService extends IService { +} diff --git a/src/main/java/com/peanut/modules/medical/service/ShopProductToMedicineLabelService.java b/src/main/java/com/peanut/modules/medical/service/ShopProductToMedicineLabelService.java new file mode 100644 index 00000000..61fe34d5 --- /dev/null +++ b/src/main/java/com/peanut/modules/medical/service/ShopProductToMedicineLabelService.java @@ -0,0 +1,8 @@ +package com.peanut.modules.medical.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductToMedicineLabel; +import com.peanut.modules.common.entity.ShopProductToSociologyLabel; + +public interface ShopProductToMedicineLabelService extends IService { +} diff --git a/src/main/java/com/peanut/modules/medical/service/ShopProductToMedicineMarketService.java b/src/main/java/com/peanut/modules/medical/service/ShopProductToMedicineMarketService.java new file mode 100644 index 00000000..82b51e0c --- /dev/null +++ b/src/main/java/com/peanut/modules/medical/service/ShopProductToMedicineMarketService.java @@ -0,0 +1,8 @@ +package com.peanut.modules.medical.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductToMedicineMarket; +import com.peanut.modules.common.entity.ShopProductToSociologyMarket; + +public interface ShopProductToMedicineMarketService extends IService { +} diff --git a/src/main/java/com/peanut/modules/medical/service/impl/ShopProductMedicineLabelServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/ShopProductMedicineLabelServiceImpl.java new file mode 100644 index 00000000..bdf11a0d --- /dev/null +++ b/src/main/java/com/peanut/modules/medical/service/impl/ShopProductMedicineLabelServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.medical.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductMedicineLabelDao; +import com.peanut.modules.common.entity.ShopProductMedicineLabel; +import com.peanut.modules.medical.service.ShopProductMedicineLabelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("medicineShopProductMedicineLabelService") +public class ShopProductMedicineLabelServiceImpl extends ServiceImpl implements ShopProductMedicineLabelService { +} diff --git a/src/main/java/com/peanut/modules/medical/service/impl/ShopProductMedicineMarketServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/ShopProductMedicineMarketServiceImpl.java new file mode 100644 index 00000000..736afe93 --- /dev/null +++ b/src/main/java/com/peanut/modules/medical/service/impl/ShopProductMedicineMarketServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.medical.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductMedicineMarketDao; +import com.peanut.modules.common.entity.ShopProductMedicineMarket; +import com.peanut.modules.medical.service.ShopProductMedicineMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("medicineShopProductMedicineMarketService") +public class ShopProductMedicineMarketServiceImpl extends ServiceImpl implements ShopProductMedicineMarketService { +} diff --git a/src/main/java/com/peanut/modules/medical/service/impl/ShopProductToMedicineLabelServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/ShopProductToMedicineLabelServiceImpl.java new file mode 100644 index 00000000..743c75c7 --- /dev/null +++ b/src/main/java/com/peanut/modules/medical/service/impl/ShopProductToMedicineLabelServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.medical.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductToMedicineLabelDao; +import com.peanut.modules.common.entity.ShopProductToMedicineLabel; +import com.peanut.modules.medical.service.ShopProductToMedicineLabelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("medicineShopProductToMedicineLabelService") +public class ShopProductToMedicineLabelServiceImpl extends ServiceImpl implements ShopProductToMedicineLabelService { +} diff --git a/src/main/java/com/peanut/modules/medical/service/impl/ShopProductToMedicineMarketServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/ShopProductToMedicineMarketServiceImpl.java new file mode 100644 index 00000000..a5e047cb --- /dev/null +++ b/src/main/java/com/peanut/modules/medical/service/impl/ShopProductToMedicineMarketServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.medical.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductToMedicineMarketDao; +import com.peanut.modules.common.entity.ShopProductToMedicineMarket; +import com.peanut.modules.medical.service.ShopProductToMedicineMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("medicineShopProductToMedicineMarketService") +public class ShopProductToMedicineMarketServiceImpl extends ServiceImpl implements ShopProductToMedicineMarketService { +} diff --git a/src/main/java/com/peanut/modules/pay/IOSPay/constant/VerifyReceiptConstant.java b/src/main/java/com/peanut/modules/pay/IOSPay/constant/VerifyReceiptConstant.java index 5480bfee..255cdcf9 100644 --- a/src/main/java/com/peanut/modules/pay/IOSPay/constant/VerifyReceiptConstant.java +++ b/src/main/java/com/peanut/modules/pay/IOSPay/constant/VerifyReceiptConstant.java @@ -12,7 +12,7 @@ public interface VerifyReceiptConstant { String APP_BUNDLE_IDENTIFIER = "com.cn.nuttyreading"; String URL_SANDBOX = "https://sandbox.itunes.apple.com/verifyReceipt"; - String URL_VERIFY = "https://sandbox.itunes.apple.com/verifyReceipt"; + String URL_VERIFY = "https://buy.itunes.apple.com/verifyReceipt"; diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index 457aaa0e..a5549d7c 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -1,12 +1,20 @@ package com.peanut.modules.sociology.controller; +import com.peanut.common.utils.R; +import com.peanut.modules.common.entity.CourseEntity; +import com.peanut.modules.sociology.service.CourseService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Slf4j @RestController("sociologyCourse") @RequestMapping("sociology/course") public class CourseController { + + } diff --git a/src/main/java/com/peanut/modules/sociology/controller/HomeController.java b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java new file mode 100644 index 00000000..e4395831 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java @@ -0,0 +1,27 @@ +package com.peanut.modules.sociology.controller; + +import com.peanut.common.utils.R; +import com.peanut.modules.common.entity.CourseEntity; +import com.peanut.modules.sociology.service.CourseService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +@Slf4j +@RestController("sociologyHome") +@RequestMapping("sociology/home") +public class HomeController { + + @Autowired + private CourseService courseService; + + //首页-我的课程 + @RequestMapping("/getMyCourse") + public R getMyCourse(String userId){ + List courseList = courseService.getMyCourse(userId); + return R.ok().put("myCourse",courseList); + } + +} diff --git a/src/main/java/com/peanut/modules/sociology/controller/ShopProductSociologyController.java b/src/main/java/com/peanut/modules/sociology/controller/ShopProductSociologyController.java new file mode 100644 index 00000000..9609322d --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/controller/ShopProductSociologyController.java @@ -0,0 +1,14 @@ +package com.peanut.modules.sociology.controller; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController("sociologyShopProductSociology") +@RequestMapping("sociology/shopProductSociology") +public class ShopProductSociologyController { + + + +} diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseService.java b/src/main/java/com/peanut/modules/sociology/service/CourseService.java index 3ecd9d90..e98b6a35 100644 --- a/src/main/java/com/peanut/modules/sociology/service/CourseService.java +++ b/src/main/java/com/peanut/modules/sociology/service/CourseService.java @@ -1,4 +1,14 @@ package com.peanut.modules.sociology.service; -public interface CourseService { +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseEntity; + +import java.util.List; + +public interface CourseService extends IService { + + List getMyCourse(String userId); + + List getCourseListBySociology(String sociologyId); + } diff --git a/src/main/java/com/peanut/modules/sociology/service/ShopProductSociologyLabelService.java b/src/main/java/com/peanut/modules/sociology/service/ShopProductSociologyLabelService.java new file mode 100644 index 00000000..098d0d9a --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/ShopProductSociologyLabelService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.sociology.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductSociologyLabel; + +public interface ShopProductSociologyLabelService extends IService { +} diff --git a/src/main/java/com/peanut/modules/sociology/service/ShopProductSociologyMarketService.java b/src/main/java/com/peanut/modules/sociology/service/ShopProductSociologyMarketService.java new file mode 100644 index 00000000..105fe746 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/ShopProductSociologyMarketService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.sociology.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductSociologyMarket; + +public interface ShopProductSociologyMarketService extends IService { +} diff --git a/src/main/java/com/peanut/modules/sociology/service/ShopProductToSociologyLabelService.java b/src/main/java/com/peanut/modules/sociology/service/ShopProductToSociologyLabelService.java new file mode 100644 index 00000000..5a93055d --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/ShopProductToSociologyLabelService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.sociology.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductToSociologyLabel; + +public interface ShopProductToSociologyLabelService extends IService { +} diff --git a/src/main/java/com/peanut/modules/sociology/service/ShopProductToSociologyMarketService.java b/src/main/java/com/peanut/modules/sociology/service/ShopProductToSociologyMarketService.java new file mode 100644 index 00000000..324b95b4 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/ShopProductToSociologyMarketService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.sociology.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.ShopProductToSociologyMarket; + +public interface ShopProductToSociologyMarketService extends IService { +} diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java new file mode 100644 index 00000000..34aa8801 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -0,0 +1,51 @@ +package com.peanut.modules.sociology.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.modules.common.dao.CourseDao; +import com.peanut.modules.common.dao.CourseToSociologyDao; +import com.peanut.modules.common.dao.UserToCourseDao; +import com.peanut.modules.common.entity.CourseEntity; +import com.peanut.modules.common.entity.CourseToSociologyEntity; +import com.peanut.modules.common.entity.UserToCourseEntity; +import com.peanut.modules.sociology.service.CourseService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Service("sociologyCourseService") +public class CourseServiceImpl extends ServiceImpl implements CourseService { + + @Autowired + public UserToCourseDao userToCourseDao; + @Autowired + public CourseToSociologyDao courseToSociologyDao; + + //我的课程 + @Override + public List getMyCourse(String userId) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.selectAll(CourseEntity.class); + wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,UserToCourseEntity::getCourseId); + wrapper.groupBy(UserToCourseEntity::getCourseId); + wrapper.eq(UserToCourseEntity::getUserId,userId); + List courseList = userToCourseDao.selectMaps(wrapper); + return courseList; + } + + //根据标签获取课程列表 + @Override + public List getCourseListBySociology(String sociologyId) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.selectAll(CourseEntity.class); + wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyEntity::getCourseId); + List courseList = courseToSociologyDao.selectMaps(wrapper); + return courseList; + } + +} diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductSociologyLabelServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductSociologyLabelServiceImpl.java new file mode 100644 index 00000000..0de3b75e --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductSociologyLabelServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.sociology.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductSociologyLabelDao; +import com.peanut.modules.common.entity.ShopProductSociologyLabel; +import com.peanut.modules.sociology.service.ShopProductSociologyLabelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("sociologyShopProductSociologyLabelService") +public class ShopProductSociologyLabelServiceImpl extends ServiceImpl implements ShopProductSociologyLabelService { +} diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductSociologyMarketServiceImpl.java new file mode 100644 index 00000000..4ac3bcc3 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductSociologyMarketServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.sociology.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductSociologyMarketDao; +import com.peanut.modules.common.entity.ShopProductSociologyMarket; +import com.peanut.modules.sociology.service.ShopProductSociologyMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("sociologyShopProductSociologyMarketService") +public class ShopProductSociologyMarketServiceImpl extends ServiceImpl implements ShopProductSociologyMarketService { +} diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductToSociologyLabelServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductToSociologyLabelServiceImpl.java new file mode 100644 index 00000000..12a0c3b7 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductToSociologyLabelServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.sociology.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductToSociologyLabelDao; +import com.peanut.modules.common.entity.ShopProductToSociologyLabel; +import com.peanut.modules.sociology.service.ShopProductToSociologyLabelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("sociologyShopProductToSociologyLabelService") +public class ShopProductToSociologyLabelServiceImpl extends ServiceImpl implements ShopProductToSociologyLabelService { +} diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductToSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductToSociologyMarketServiceImpl.java new file mode 100644 index 00000000..c1cfc4f9 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/impl/ShopProductToSociologyMarketServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.sociology.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.ShopProductToSociologyMarketDao; +import com.peanut.modules.common.entity.ShopProductToSociologyMarket; +import com.peanut.modules.sociology.service.ShopProductToSociologyMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("sociologyShopProductToSociologyMarketService") +public class ShopProductToSociologyMarketServiceImpl extends ServiceImpl implements ShopProductToSociologyMarketService { +}