springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
@@ -27,13 +27,13 @@ @Resource private CommunityService communityService; @ApiOperation(value = "分页查询店铺" , response = ComShopStoreVO.class) @ApiOperation(value = "分页查询店铺" , response = PageShopStoreVO.class) @PostMapping("pageshopstore") public R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO) { return communityService.pageShopStore(comShopStoreDTO); } @ApiOperation(value = "查询店铺详情" , response = ComShopStoreVO.class) @ApiOperation(value = "查询店铺详情" , response = PageShopStoreVO.class) @PostMapping("shopstoredetail") public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) { if(comShopStoreDTO == null || comShopStoreDTO.getStoreId() == null){ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java
@@ -110,5 +110,5 @@ * 店铺信息 */ @ApiModelProperty("商品店铺信息") private ComShopStoreVO shopStoreVO; private PageShopStoreVO shopStoreVO; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java
@@ -67,7 +67,7 @@ private List<ComShopOrderGoodsVO> orderGoodsVOList; @ApiModelProperty(value = "订单下店铺信息") private ComShopStoreVO shopStoreVO; private PageShopStoreVO shopStoreVO; @ApiModelProperty(value = "用户收货地址id") private ComShopUserAddressVO userAddressVO; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPreviewVO.java
@@ -26,7 +26,7 @@ * 店铺信息 */ @ApiModelProperty(value = "店铺信息") private ComShopStoreVO shopStoreVO; private PageShopStoreVO shopStoreVO; /** * 待购买商品列表 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1804,7 +1804,7 @@ * 商品列表-分页查询 * @param pageComShopGoodsDTO 添加数据 */ @PostMapping("/shop/pageShopGoods") @PostMapping("/shop/pageGoods") R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO); /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -37,8 +37,6 @@ @Resource private ComShopOrderService comShopOrderService; @Resource private ComShopGoodsService comShopGoodsService; @Resource private ComShopCartService comShopCartService; @Resource private ComShopUserAddressService comShopUserAddressService; @@ -46,7 +44,7 @@ /** * 店铺列表-分页查询 * @param pageComShopStoreDTO 查询参数 * @return ComShopStoreVO * @return PageShopStoreVO */ @PostMapping("/pageShopStore") public R pageShopStore(@RequestBody PageComShopStoreDTO pageComShopStoreDTO) { @@ -145,7 +143,7 @@ * @param comShopGoodsDTO 请求参数 * @return 商品列表 */ @PostMapping("pageShopGoods") @PostMapping("/pageShopGoods") public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) { return comShopGoodsService.pageShopGoods(comShopGoodsDTO); } @@ -326,9 +324,9 @@ /** * 商品列表-分页查询 * @param pageComShopGoodsDTO 查询参数 * @return ComShopStoreVO * @return PageShopStoreVO */ @PostMapping("/pageShopGoods") @PostMapping("pageGoods") public R pageShopStore(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) { return comShopGoodsService.pageGoodsList(pageComShopGoodsDTO); } @@ -338,7 +336,7 @@ * @param addShopGoodsVO * @return */ @PostMapping("/saveShopGoods") @PostMapping("saveShopGoods") public R saveStore(@RequestBody AddShopGoodsVO addShopGoodsVO) { return comShopGoodsService.saveShopGoods(addShopGoodsVO); } @@ -349,7 +347,7 @@ * @param id 商铺Id * @return */ @PostMapping("/editShopGoods/{id}") @PostMapping("editShopGoods/{id}") public R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) { return comShopGoodsService.editShopGoods(id, addShopGoodsVO); } @@ -359,7 +357,7 @@ * @param id * @return */ @PostMapping("/deleteShopGoods") @PostMapping("deleteShopGoods") public R deleteShopGoods(@RequestBody Long[] id) { return comShopGoodsService.deleteShopGoods(id); } @@ -369,7 +367,7 @@ * @param id * @return */ @GetMapping("/changeShopGoodsStatus") @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
@@ -6,7 +6,7 @@ import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.shop.ComShopGoodsVO; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
@@ -10,7 +10,7 @@ import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.vos.shop.ComShopOrderVO; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.service_community.model.dos.ComShopOrderDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopGoodsService.java
@@ -38,7 +38,7 @@ /** * 商品列表-分页查询 * @param pageComShopGoodsDTO 查询参数 * @return ComShopStoreVO * @return PageShopStoreVO */ R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO);
@@ -16,7 +16,7 @@ /** * 店铺列表-分页查询 * @param pageComShopStoreDTO 查询参数 * @return ComShopStoreVO * @return PageShopStoreVO */ R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO);
@@ -19,11 +19,10 @@ import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO; import com.panzhihua.common.model.vos.shop.ComShopGoodsAttrVO; import com.panzhihua.common.model.vos.shop.ComShopGoodsVO; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; 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.service_community.dao.ComShopGoodsDAO; import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO; import com.panzhihua.service_community.dao.ComShopStoreDAO; @@ -217,7 +216,7 @@ //查询商品店铺信息 ComShopStoreDO shopStoreDO = shopStoreDAO.selectById(goodsDO.getStoreId()); ComShopStoreVO shopStoreVO = new ComShopStoreVO(); PageShopStoreVO shopStoreVO = new PageShopStoreVO(); BeanUtils.copyProperties(shopStoreDO,shopStoreVO); //设置值 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOperLogServiceImpl.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.common.model.vos.shop.ShopOperLogVO; import com.panzhihua.service_community.dao.ComShopOperLogDAO; import com.panzhihua.service_community.dao.ComShopOrderDAO; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -134,7 +134,7 @@ //查询店铺信息 ComShopStoreDO storeDO = comShopStoreDAO.selectById(storeId); if(storeDO != null){ ComShopStoreVO shopStoreVO = new ComShopStoreVO(); PageShopStoreVO shopStoreVO = new PageShopStoreVO(); BeanUtils.copyProperties(storeDO,shopStoreVO); orderPreviewVO.setShopStoreVO(shopStoreVO); } @@ -310,7 +310,7 @@ } orderVo.setOrderGoodsVOList(orderGoodsVOS); ComShopStoreVO shopStoreVO = new ComShopStoreVO(); PageShopStoreVO shopStoreVO = new PageShopStoreVO(); //查询店铺信息 ComShopStoreDO shopStoreDO = comShopStoreDAO.selectById(orderVo.getStoreId()); if(shopStoreDO != null){ @@ -339,7 +339,7 @@ BeanUtils.copyProperties(shopOrderDO,orderVO); orderVO.setOrderTotal(shopOrderDO.getTotalAmount()); ComShopStoreVO shopStoreVO = new ComShopStoreVO(); PageShopStoreVO shopStoreVO = new PageShopStoreVO(); //查询店铺信息 ComShopStoreDO shopStoreDO = comShopStoreDAO.selectById(shopOrderDO.getStoreId()); if(shopStoreDO != null){ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -7,10 +7,9 @@ import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.common.model.vos.shop.ComShopStoreVO; import com.panzhihua.common.model.vos.shop.PageShopStoreVO; import com.panzhihua.service_community.dao.ComShopGoodsDAO; 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.ComShopStoreDO; @@ -35,7 +34,7 @@ /** * 查询店铺列表 * @param comShopStoreDTO 请求参数 * @param pageComShopStoreDTO 请求参数 * @return 店铺列表 */ @@ -61,7 +60,7 @@ if(storeDO.getStatus().equals(ComShopStoreDO.status.no)){ return R.fail(402,"店铺已被禁用"); } ComShopStoreVO shopStoreVO = new ComShopStoreVO(); PageShopStoreVO shopStoreVO = new PageShopStoreVO(); BeanUtils.copyProperties(storeDO, shopStoreVO); //查询店铺下商品信息
