springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -3,12 +3,12 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.questnaire.QuestnaireListVo; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.ChangePasswordVO; @@ -17,13 +17,13 @@ import com.panzhihua.common.service.user.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import javax.validation.constraints.NotNull; /** * @auther llming @@ -38,21 +38,21 @@ @Resource private UserService userService; @ApiOperation(value = "分页查询商家", response = ComShopStoreVO.class) @PostMapping("/page") @ApiOperation(value = "分页查询商家", response = PageShopStoreVO.class) @PostMapping("/store/page") public R pageVolunteer(@RequestBody PageComShopStoreDTO pageComShopStoreDTO) { return communityService.pageStoreList(pageComShopStoreDTO); } @ApiOperation(value = "保存商家") @PostMapping("/save") @PostMapping("/store/save") public R saveStore(@Valid @RequestBody ShopStoreVO storeVO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long loginUserId = loginUserInfo.getUserId(); if (storeVO == null) { return R.fail(); } R<SysUserVO> sysUserVO = userService.getSysUserVOByPhone(storeVO.getPhone()); R<SysUserVO> sysUserVO = userService.getSysUserVOByAccount(storeVO.getStoreAccount()); JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(sysUserVO.getData())); SysUserVO entityVo = jsonObject.toJavaObject(SysUserVO.class); storeVO.setSysUserId(entityVo.getUserId()); @@ -76,10 +76,10 @@ } @ApiOperation(value = "编辑商家、启用、禁用") @PostMapping("/edit/{id}") @PostMapping("/store/edit/{id}") @ApiImplicitParam(name = "id", value = "商家id") public R editStore(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) { R<LoginUserInfoVO> sysUserVO = userService.getUserInfoByUserId(storeVO.getSysUserId() + ""); R<LoginUserInfoVO> sysUserVO = userService.getSysUserVOByAccount(storeVO.getStoreAccount()); if (sysUserVO.getData() == null) { return R.fail("没有相关的用户！"); } @@ -90,6 +90,7 @@ if( storeInfoVO.getCode()==500){ return R.fail(storeInfoVO.getMsg()); } //维护sys_user ShopStoreVO shopStoreVO = JSON.parseObject(JSON.toJSONString(storeInfoVO.getData())).toJavaObject(ShopStoreVO.class); ChangePasswordVO changePasswordVO = new ChangePasswordVO(); changePasswordVO.setOldPassword(shopStoreVO.getStorePassword()); @@ -103,9 +104,44 @@ } @ApiOperation(value = "删除商家") @PostMapping("/delete") @PostMapping("/store/delete") public R delete(@RequestBody Long[] ids) { return communityService.deleteStore(ids); } @ApiOperation(value = "分页查询商品", response = PageShopStoreVO.class) @PostMapping("/goods/page") public R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) { return communityService.pageGoodsList(pageComShopGoodsDTO); } @ApiOperation(value = "新增商品") @PostMapping("/goods/save") R saveShopGoods(@RequestBody AddShopGoodsVO addShopGoodsVO){ return communityService.saveShopGoods(addShopGoodsVO); } @ApiOperation(value = "编辑商品") @PostMapping("/goods/edit/{id}") R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) { return communityService.editShopGoods(id,addShopGoodsVO); } @ApiOperation(value = "删除商品") @PostMapping("/goods/delete") R deleteShopGoods(@RequestBody Long[] id) { return communityService.deleteShopGoods(id); } @ApiOperation(value = "商品上下架") @ApiImplicitParams({@ApiImplicitParam(value = "id",name = "商品Id"), @ApiImplicitParam(value = "status",name = "1.上架 2.下架 ")}) @GetMapping("/goods/changeStatus") R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status) { return communityService.changeStatus(id,status); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java
@@ -11,6 +11,16 @@ @ApiModel("分页查询商品") @Data public class PageComShopGoodsDTO { @ApiModelProperty(value = "商品名称") private String name; @ApiModelProperty(value = "店铺名称") private String storeName; @ApiModelProperty(value = "商品状态(1.出售中 2.已下架 3.回收站)", example = "1") private Integer status; @ApiModelProperty(value = "分页-当前页数", example = "1") private Long pageNum;
New file @@ -0,0 +1,25 @@ package com.panzhihua.common.model.vos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; /** * @auther llming * @describe */ @Data @ApiModel("商品规格") public class AddShopGoodsAttrVO { @ApiModelProperty("商品规格Id:编辑必传") private Long goodsAttrId; @ApiModelProperty("商品规格") private String goodsAttr; @ApiModelProperty("规格价格") private BigDecimal attrPrice; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopGoodsVO.java @@ -5,14 +5,15 @@ import lombok.Data; import java.math.BigDecimal; import java.util.List; /** * @auther llming * @describe 商品 */ @Data @ApiModel("商品") public class ShopGoodsVO { @ApiModel("添加商品") public class AddShopGoodsVO { @ApiModelProperty("店铺id") private Long storeId; @@ -37,4 +38,7 @@ @ApiModelProperty("商品描述") private String goodsDescribe; @ApiModelProperty("商品规格") private List<AddShopGoodsAttrVO> goodsAttrVOList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopStoreVO.java
File was deleted springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopGoodsVO.java
New file @@ -0,0 +1,94 @@ package com.panzhihua.common.model.vos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Date; import java.util.List; /** * @auther llming * @describe * @describe 商品VO */ @Data @ApiModel("商品") public class PageShopGoodsVO { @ApiModelProperty("商品id") private Long id; @ApiModelProperty("商品分类id") private Long typeId; @ApiModelProperty("商品名称") private String name; @ApiModelProperty("商铺名称") private String storeName; @ApiModelProperty("店铺id") private Long storeId; @ApiModelProperty("商品主图") private String goodsPic; @ApiModelProperty("商品展示图") private String images; @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)") private Integer status; @ApiModelProperty("商品销量") private Integer sale; @ApiModelProperty("商品原价") private BigDecimal originalPrice; @ApiModelProperty("商品现价") private BigDecimal price; @ApiModelProperty("商品单位") private String unit; @ApiModelProperty("商品排序") private Integer order; @ApiModelProperty("商品总库存") private Integer stock; @ApiModelProperty("商品详情") private String details; @ApiModelProperty("商品备注") private String remark; @ApiModelProperty("商品描述") private String goodsDescribe; @ApiModelProperty("配送方式（1.商家配送 2.快递物流）") private Integer deliveryType; @ApiModelProperty("删除状态（1.未删除 2.已删除）") private Integer deleteStatus; @ApiModelProperty("创建时间") private Date createAt; @ApiModelProperty("修改时间") private Date updateAt; @ApiModelProperty("规格") private List<AddShopGoodsAttrVO> goodsAttts; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java
New file @@ -0,0 +1,49 @@ package com.panzhihua.common.model.vos.shop; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @auther lyq * @create 2021-04-14 15:02:14 * @describe 店铺VO */ @Data @ApiModel("商城店铺") public class PageShopStoreVO { @ApiModelProperty("负责人") private String contacts; @ApiModelProperty("店铺登陆账号") private String storeAccount; @ApiModelProperty("联系方式") private String phone; @ApiModelProperty("店铺状态（1.启用 2.禁用）") private Integer status; @ApiModelProperty("店铺id") private Long id; @ApiModelProperty("店铺名称") private String name; @ApiModelProperty("店铺logo") private String logo; @ApiModelProperty("配送方式（1.商家配送 2.快递物流）") private Integer deliveryType; @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java
@@ -57,8 +57,11 @@ * 保存时添加sys_user所需 */ @ApiModelProperty("sysUserId") @JsonIgnore private Long sysUserId; @ApiModelProperty(" 店铺状态（1.启用 2.禁用）") private Integer status; /** * 当前登陆用户Id */ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -4,6 +4,7 @@ import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -11,6 +12,7 @@ import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo; import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO; import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import org.springframework.cloud.openfeign.FeignClient; @@ -1793,4 +1795,43 @@ @GetMapping("/shop/getStoreInfo") R getStoreInfo(@RequestParam("id")Long id); /** * 商品列表-分页查询 * @param pageComShopGoodsDTO 添加数据 */ @PostMapping("/shop/pageShopGoods") R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO); /** * 新增商品 * @param addShopGoodsVO * @return */ @PostMapping("/shop/saveShopGoods") R saveShopGoods(@RequestBody AddShopGoodsVO addShopGoodsVO); /** * 编辑商品 * @param id * @param addShopGoodsVO * @return */ @PostMapping("/shop/editShopGoods/{id}") R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO); /** * 删除商品 * @param id * @return */ @PostMapping("/shop/deleteShopGoods") R deleteShopGoods(@RequestBody Long[] id); /** * 修改商品状态 * @param id * @return */ @PostMapping("/shop/changeShopGoodsStatus") R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -540,6 +540,14 @@ @GetMapping("getUserByPhone") R getSysUserVOByPhone(@RequestParam(value = "phone") String phone); /** * 通过账号查询用户信息 * @param account * @return */ @GetMapping("getUserByAccount") R getSysUserVOByAccount(@RequestParam(value = "account") String account); /** * 基础数据》居民管理》居民列表 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -1,17 +1,17 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.service_community.service.ComShopGoodsService; import com.panzhihua.service_community.service.ComShopStoreService; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotNull; @Slf4j @RestController @@ -20,6 +20,8 @@ @Resource private ComShopStoreService comShopStoreService; @Resource private ComShopGoodsService comShopGoodsService; /** * 店铺列表-分页查询 @@ -77,4 +79,58 @@ } /** * 商品列表-分页查询 * @param pageComShopGoodsDTO 查询参数 * @return ComShopStoreVO */ @PostMapping("/pageShopGoods") public R pageShopStore(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) { return comShopGoodsService.pageGoodsList(pageComShopGoodsDTO); } /** * 新增商品 * @param addShopGoodsVO * @return */ @PostMapping("/saveShopGoods") public R saveStore(@RequestBody AddShopGoodsVO addShopGoodsVO) { return comShopGoodsService.saveShopGoods(addShopGoodsVO); } /** * 编辑商品 * @param addShopGoodsVO * @param id 商铺Id * @return */ @PostMapping("/editShopGoods/{id}") public R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) { return comShopGoodsService.editShopGoods(id, addShopGoodsVO); } /** * 删除商品 * @param id * @return */ @PostMapping("/deleteShopGoods") public R deleteShopGoods(@RequestBody Long[] id) { return comShopGoodsService.deleteShopGoods(id); } /** * 删除商品 * @param id * @return */ @GetMapping("/changeShopGoodsStatus") public R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status) { return comShopGoodsService.changeStatus(id,status); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.PageShopGoodsVO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.service_community.model.dos.ComShopGoodsDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,7 +19,21 @@ @Mapper public interface ComShopGoodsDAO extends BaseMapper<ComShopGoodsDO> { @Select("select id,type_id,name,store_id,goods_pic,images,status,sale,original_price,price,unit,order,stock,details,remark,goods_describe,delivery_type,delete_status,create_at,update_at from com_shop_store") IPage<ComShopStoreVO> pageShopGoods(Page page, PageComShopGoodsDTO pageComShopGoodsDTO); @Select("<script>" + "select c.id,c.type_id,css.name as storeName,c.name,c.store_id,c.goods_pic,c.images,c.status,c.sale,c.original_price,c.price,c.unit,c.order,c.stock,c.details,c.remark,c.goods_describe,c.delivery_type,c.delete_status,c.create_at,c.update_at from com_shop_goods c \n" + "right join com_shop_store css on c.store_id=css.id\n" + " <where>" + "<if test='pageComShopGoodsDTO.storeName != null and pageComShopGoodsDTO.storeName.trim() != ""'>" + "and css.name like concat('%',#{pageComShopGoodsDTO.storeName},'%') \n" + " </if> " + "<if test='pageComShopGoodsDTO.name != null and pageComShopGoodsDTO.name.trim() != ""'>" + "and c.name like concat('%',#{pageComShopGoodsDTO.name},'%') \n" + " </if> " + "<if test='pageComShopGoodsDTO.status != null'>" + "and c.status like concat('%',#{pageComShopGoodsDTO.status},'%') \n" + " </if> " + " </where>" + "</script>") IPage<PageShopGoodsVO> pageShopGoods(Page page, @Param("pageComShopGoodsDTO") PageComShopGoodsDTO pageComShopGoodsDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.service_community.model.dos.ComShopStoreDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,7 +19,7 @@ public interface ComShopStoreDAO extends BaseMapper<ComShopStoreDO> { @Select("<script>" + "select id,`name`,classify_id,logo,phone,delivery_type,remark,`status`,sale,sale_volume,store_detail from com_shop_store c" + "select id,`name`,store_account,classify_id,logo,phone,delivery_type,remark,`status`,sale,sale_volume,store_detail,create_at from com_shop_store c" + " <where>" + "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>" + "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" + @@ -39,6 +39,6 @@ " </where>" + " order by c.create_at desc"+ "</script>") IPage<ComShopStoreVO> pageShopStore(Page page, @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO); IPage<PageShopStoreVO> pageShopStore(Page page, @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java
@@ -34,6 +34,7 @@ /** * 商品名称 */ @TableField("`name`") private String name; /** @@ -54,6 +55,7 @@ /** * 商品状态(1.出售中 2.已下架 3.回收站) */ @TableField("`status`") private Integer status; /** @@ -79,6 +81,7 @@ /** * 商品排序 */ @TableField("`order`") private Integer order; /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopGoodsService.java
@@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.ShopGoodsVO; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.service_community.model.dos.ComShopGoodsDO; /** @@ -15,28 +15,28 @@ /** * 添加商品 * @param shopGoodsVO * @param addShopGoodsVO * @return */ R saveShopGoods(ShopGoodsVO shopGoodsVO); R saveShopGoods(AddShopGoodsVO addShopGoodsVO); /** * 商品列表-分页查询 * @param pageComShopGoodsDTO 查询参数 * @return ComShopStoreVO */ R pageStoreList(PageComShopGoodsDTO pageComShopGoodsDTO); R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO); /** * 编辑商品、上架、下架 * 编辑商品 * * @param id 商铺ID * @param shopGoodsVO * @param addShopGoodsVO * @return */ R editShopGoods(Long id, ShopGoodsVO shopGoodsVO); R editShopGoods(Long id, AddShopGoodsVO addShopGoodsVO); /** * 删除商品 @@ -44,4 +44,11 @@ * @return */ R deleteShopGoods(Long[] id); /** * 修改商品状态 * @param id * @return */ R changeStatus(Long id,Integer status); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopStoreService.java
@@ -1,10 +1,8 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.ShopGoodsVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.service_community.model.dos.ComShopStoreDO;
@@ -1,20 +1,32 @@ package com.panzhihua.service_community.service.impl; import java.math.BigDecimal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.ShopGoodsVO; import com.panzhihua.common.model.vos.shop.AddShopGoodsAttrVO; import com.panzhihua.common.model.vos.shop.PageShopGoodsVO; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO; import com.panzhihua.service_community.dao.ComShopGoodsDAO; import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO; import com.panzhihua.service_community.model.dos.ComShopGoodsDO; import com.panzhihua.service_community.model.dos.ComShopStoreDO; import com.panzhihua.service_community.service.ComShopGoodsService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; /** * @auther lyq @@ -24,35 +36,106 @@ @Slf4j @Service public class ComShopGoodsServiceImpl extends ServiceImpl<ComShopGoodsDAO, ComShopGoodsDO> implements ComShopGoodsService { @Resource private ComShopGoodsAttrServiceImpl goodsAttrService; @Override public R saveShopGoods(ShopGoodsVO shopGoodsVO) { if (shopGoodsVO == null) { public R saveShopGoods(AddShopGoodsVO addShopGoodsVO) { if (addShopGoodsVO == null) { return R.ok("500", "数据为空！"); } ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO(); BeanUtils.copyProperties(shopGoodsVO, shopGoodsDO); BeanUtils.copyProperties(addShopGoodsVO, shopGoodsDO); shopGoodsDO.setSale(0); this.baseMapper.insert(shopGoodsDO); int goodsId = this.baseMapper.insert(shopGoodsDO); if (goodsId > 0) { ArrayList<ComShopGoodsAttrDO> goodsAttrDOS = Lists.newArrayList(); addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> { ComShopGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId()); //维护商品规格表 if (goodDO == null) { throw new ServiceException("商家id不存在！"); } ComShopGoodsAttrDO shopGoodsAttrDO = new ComShopGoodsAttrDO(); shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId()); shopGoodsAttrDO.setStoreId(goodDO.getStoreId()); shopGoodsAttrDO.setGoodsName(goodDO.getName()); //如果没有规格加默认 shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr()); shopGoodsAttrDO.setIsDefault(1); shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice()); goodsAttrDOS.add(shopGoodsAttrDO); }); if (goodsAttrDOS.size() > 0) { goodsAttrService.saveBatch(goodsAttrDOS); } } return R.ok(); } @Override public R pageStoreList(PageComShopGoodsDTO pageComShopGoodsDTO) { public R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO) { Page page = new Page<>(pageComShopGoodsDTO.getPageNum(), pageComShopGoodsDTO.getPageSize()); IPage<ComShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO); IPage<PageShopGoodsVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO); List<PageShopGoodsVO> shopGoodsVOS = comShopStoreVOIPage.getRecords(); List<Long> goodsIds = shopGoodsVOS.stream().map(PageShopGoodsVO::getId).collect(Collectors.toList()); LambdaQueryWrapper<ComShopGoodsAttrDO> in = new LambdaQueryWrapper<ComShopGoodsAttrDO>().in(ComShopGoodsAttrDO::getGoodsId, goodsIds); //分页查询商品规格，组装数据 List<ComShopGoodsAttrDO> goodsAttrDOS = goodsAttrService.getBaseMapper().selectList(in); comShopStoreVOIPage.getRecords().forEach(vo -> { List<ComShopGoodsAttrDO> goodsAttrDOs = goodsAttrDOS.stream().filter(goodsAttr -> goodsAttr.getGoodsId().equals(vo.getId())).collect(Collectors.toList()); ArrayList<AddShopGoodsAttrVO> goodsAttrVOList = Lists.newArrayList(); for (ComShopGoodsAttrDO oneGoodsAttrDO :goodsAttrDOs) { AddShopGoodsAttrVO goodsAttrVO = new AddShopGoodsAttrVO(); goodsAttrVO.setGoodsAttrId(oneGoodsAttrDO.getId()); goodsAttrVO.setGoodsAttr(oneGoodsAttrDO.getGoodsAttr()); goodsAttrVO.setAttrPrice(oneGoodsAttrDO.getPrice()); goodsAttrVOList.add(goodsAttrVO); } vo.setGoodsAttts(goodsAttrVOList); }); return R.ok(comShopStoreVOIPage); } @Override public R editShopGoods(Long id, ShopGoodsVO shopGoodsVO) { if (shopGoodsVO == null) { public R editShopGoods(Long id, AddShopGoodsVO addShopGoodsVO) { if (addShopGoodsVO == null) { return R.ok("500", "数据为空！"); } LambdaQueryWrapper<ComShopGoodsDO> query = new LambdaQueryWrapper<ComShopGoodsDO>().eq(ComShopGoodsDO::getId, id); ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO(); BeanUtils.copyProperties(shopGoodsVO,shopGoodsDO); BeanUtils.copyProperties(addShopGoodsVO, shopGoodsDO); int update = this.baseMapper.update(shopGoodsDO, query); return update > 0 ? R.ok() : R.fail(); if (update < 1) { throw new ServiceException("修改失败"); } ArrayList<ComShopGoodsAttrDO> goodsAttrDOS = Lists.newArrayList(); addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> { if (goodsAttr.getGoodsAttrId() == null) { throw new ServiceException("规格Id为空"); } //先删除 ComShopGoodsAttrDO goodsAttrDO = goodsAttrService.getBaseMapper().selectById(goodsAttr.getGoodsAttrId()); if (goodsAttrDO == null) { throw new ServiceException("规格为空,请检查规格Id"); } ComShopGoodsAttrDO shopGoodsAttrDO = new ComShopGoodsAttrDO(); shopGoodsAttrDO.setGoodsId(id); shopGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId()); shopGoodsAttrDO.setGoodsName(shopGoodsDO.getName()); //如果没有规格加默认 shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr()); shopGoodsAttrDO.setIsDefault(1); shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice()); goodsAttrDOS.add(shopGoodsAttrDO); }); if (goodsAttrDOS.size() > 0) { LambdaQueryWrapper<ComShopGoodsAttrDO> oldGoodsAttrQuery = new LambdaQueryWrapper<ComShopGoodsAttrDO>().eq(ComShopGoodsAttrDO::getGoodsId, id); //删除旧商品规格，再行添加 goodsAttrService.getBaseMapper().delete(oldGoodsAttrQuery); goodsAttrService.saveBatch(goodsAttrDOS); } return R.ok(); } @Override @@ -63,4 +146,15 @@ int update = this.baseMapper.update(storeDO, query); return update > 0 ? R.ok() : R.fail(); } @Override public R changeStatus(Long id, Integer status) { ComShopGoodsDO shopGoodsDO = this.baseMapper.selectById(id); if(shopGoodsDO==null){ return R.fail("id有误!"); } shopGoodsDO.setStatus(status); this.baseMapper.updateById(shopGoodsDO); return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -4,14 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.ShopGoodsVO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.service_community.dao.ComShopStoreDAO; import com.panzhihua.service_community.model.dos.ComShopGoodsDO; import com.panzhihua.service_community.model.dos.ComShopStoreDO; import com.panzhihua.service_community.service.ComShopStoreService; import lombok.extern.slf4j.Slf4j; @@ -29,7 +26,7 @@ @Override public R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO) { Page page = new Page<>(pageComShopStoreDTO.getPageNum(), pageComShopStoreDTO.getPageSize()); IPage<ComShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopStore(page, pageComShopStoreDTO); IPage<PageShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopStore(page, pageComShopStoreDTO); return R.ok(comShopStoreVOIPage); }
@@ -611,6 +611,16 @@ } /** * 通过账号查询用户信息 * @param account * @return */ @GetMapping("getUserByAccount") public R getSysUserVOByAccount(@RequestParam(value = "account") String account){ return userService.getSysUserVOByAccount(account); } /** *分页查询人口管理 * @param pageInputUserDTO 查询参数 * @return 分页数据 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -357,4 +357,12 @@ * @return 标签集合 */ R listTags(Long communityId); /** * 通过账号查询用户信息 * @param account * @return */ R getSysUserVOByAccount(String account); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1558,4 +1558,15 @@ } return R.ok(list); } @Override public R getSysUserVOByAccount(String account) { SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, account)); if (ObjectUtils.isEmpty(sysUserDO)) { return R.fail("用户不存在"); } SysUserVO sysUserVO = new SysUserVO(); BeanUtils.copyProperties(sysUserDO, sysUserVO); return R.ok(sysUserVO); } }
