From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期二, 08 十一月 2022 18:16:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientGoodsCategoryDTO.java | 46 + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientGoodsCategoryServiceImpl.java | 127 ++++ springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java | 5 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java | 35 + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsAttrDO.java | 114 +++ flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 2 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java | 41 + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java | 67 ++ flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 11 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerStoreDTO.java | 34 + springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 23 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 42 + springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsAttrVO.java | 89 ++ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopFlowerGoodsVO.java | 84 ++ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java | 24 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml | 75 ++ flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 167 +++++ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientGoodsCategoryDTO.java | 28 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 9 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 6 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java | 57 + springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerGoodsDTO.java | 31 + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsAttrMapper.xml | 30 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 55 + springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java | 36 + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientGoodsCategoryService.java | 70 ++ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java | 30 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java | 5 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientGoodsCategoryMapper.xml | 51 + springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java | 120 +++ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientGoodsCategoryVO.java | 40 + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsDO.java | 162 +++++ springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 5 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientGoodsCategoryDAO.java | 60 + springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java | 4 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml | 3 flower_city/pom.xml | 14 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java | 4 38 files changed, 1,778 insertions(+), 28 deletions(-) diff --git a/flower_city/pom.xml b/flower_city/pom.xml index 41ffebc..5ed6e6a 100644 --- a/flower_city/pom.xml +++ b/flower_city/pom.xml @@ -93,6 +93,20 @@ </dependency> <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml</artifactId> + <version>4.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>4.1.1</version> + </dependency> + + + <dependency> <groupId>com.icexxx</groupId> <artifactId>iceworkday</artifactId> <version>2.0.2.0</version> diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java index b2b370d..4373024 100644 --- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java +++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java @@ -303,8 +303,15 @@ { boolean a = false; String fileName = file.getOriginalFilename(); - return null; - + Integer b = iTransactionEventService.batchImport(fileName, file); + if (b == 3) {// + return ResultData.success("全部导入成功");//全部导入成功 + } else if (b == 2) { + return ResultData.success("部分导入成功");//部分导入成功 + } else if (b == 0) { + return ResultData.error("部分失败");//导入失败 + } + return ResultData.error("部分失败");//导入失败 } diff --git a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java index 3262c8d..9aa31e6 100644 --- a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java +++ b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java @@ -7,6 +7,7 @@ import com.dg.core.db.manual.pojo.RecommendResult; import com.dg.core.db.manual.pojo.Search; import org.springframework.data.repository.query.Param; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -150,5 +151,6 @@ * @return */ List<TransactionEvent> selectClassifyList(List<String> ids); + Integer batchImport(String fileName, MultipartFile file) ; } diff --git a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java index 0d3a4c8..9976d5d 100644 --- a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java +++ b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java @@ -11,11 +11,15 @@ import com.dg.core.db.manual.pojo.Search; import com.dg.core.service.ITransactionEventService; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.IOException; import java.io.InputStream; import java.time.LocalDate; import java.time.LocalDateTime; @@ -94,7 +98,7 @@ public int deleteConfigById(String Id) { List<GuideRepairOrder> guideRepairOrders = guideRepairOrderMapper .selectList(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getMatterId, Id)); - if (guideRepairOrders.size() == 0){ + if (guideRepairOrders.size() == 0) { return baseMapper.deleteConfigById(Id); } return 0; @@ -245,15 +249,166 @@ @Override public List<TransactionEvent> selectList(String keyWord) { - if (keyWord!=null&&keyWord!=""){ - return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName,keyWord)); - } - else { - return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda()); + if (keyWord != null && keyWord != "") { + return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName, keyWord)); + } else { + return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda()); } } + @Override + public Integer batchImport(String fileName, MultipartFile file) { + boolean notNull = false; + if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) { + throw new RuntimeException("选择文件格式不正确,请下载模板上传"); + } + boolean isExcel2003 = true; + if (fileName.matches("^.+\\.(?i)(xlsx)$")) { + isExcel2003 = false; + } + InputStream is = null; + try { + is = file.getInputStream(); + } catch (IOException e) { + throw new RuntimeException(e); + } + Workbook wb = null; + + if (isExcel2003) { + try { + wb = new HSSFWorkbook(is); + } catch (IOException e) { + throw new RuntimeException(e); + } + } else { + try { + wb = new XSSFWorkbook(is); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + Integer failNum = 0;//失败数量 + // 获取excel的sheet页数 + int numberOfSheets = wb.getNumberOfSheets(); + for (int j = 0; j < numberOfSheets; j++) { + //获取excel字段名称进行比较 + Sheet sheetAt = wb.getSheetAt(j); + if(sheetAt.getRow(2)!=null){ + Row row1 = sheetAt.getRow(2); + TransactionEvent transactionEvent = baseMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getMatterName, new DataFormatter().formatCellValue(row1.getCell(1)))); + boolean isAdd = false; + if (transactionEvent == null) { + transactionEvent = new TransactionEvent(); + isAdd = true; + } + transactionEvent.setMatterName(new DataFormatter().formatCellValue(row1.getCell(1))); + Row row2 = sheetAt.getRow(3); + transactionEvent.setSetGist("<p>" + new DataFormatter().formatCellValue(row2.getCell(1)) + "</p>"); + Row row3 = sheetAt.getRow(4); + Row row4 = sheetAt.getRow(5); + transactionEvent.setBasicInformation("<p> 事项名称:" + new DataFormatter().formatCellValue(row1.getCell(1)) + "<br />" + + new DataFormatter().formatCellValue(row3.getCell(0)) + ":" + new DataFormatter().formatCellValue(row3.getCell(1))+ "<br />" + + new DataFormatter().formatCellValue(row3.getCell(3)) + ":" + new DataFormatter().formatCellValue(row3.getCell(4)) + "<br />" + + new DataFormatter().formatCellValue(row4.getCell(0)) + ":" + new DataFormatter().formatCellValue(row4.getCell(1)) + "</p>"); + int i = 7; + String applicationMaterial = "<p>"; + while (true) { + Row row = sheetAt.getRow(i); + if (row.getCell(0).getStringCellValue().equals("办理途径、条件和注意事项")) { + i = i + 2; + break; + } + applicationMaterial = applicationMaterial + "办理区域:" + new DataFormatter().formatCellValue(row.getCell(0)) + "<br />" + + "咨询电话:" + new DataFormatter().formatCellValue(row.getCell(1)) + "<br />" + + "办公地址:" + new DataFormatter().formatCellValue(row.getCell(2)) + "<br />" + + "办公时间:" + new DataFormatter().formatCellValue(row.getCell(3)) + "<br />"; + applicationMaterial = applicationMaterial + "<br />"; + i++; + } + applicationMaterial = applicationMaterial + "</p>"; + transactionEvent.setApplicationMaterial(applicationMaterial); + String acceptConditions = "<p>"; + while (true) { + Row row = sheetAt.getRow(i); + if (row.getCell(0).getStringCellValue().equals("(二)网上申报")) { + i = i + 1; + break; + } + acceptConditions = acceptConditions + new DataFormatter().formatCellValue(row.getCell(0)) + " " + +new DataFormatter().formatCellValue( row.getCell(1)) + " " + + new DataFormatter().formatCellValue(row.getCell(2)) + " "; + acceptConditions = acceptConditions + "<br />"; + i++; + } + acceptConditions = acceptConditions + "</p>"; + transactionEvent.setAcceptConditions(acceptConditions); + String rates = "<p>"; + while (true) { + Row row = sheetAt.getRow(i); + if (row.getCell(0).getStringCellValue().equals("(三)手机移动申报")) { + i = i + 1; + break; + } + rates = rates + new DataFormatter().formatCellValue(row.getCell(0)) + " " + + new DataFormatter().formatCellValue(row.getCell(1)) + " " + + new DataFormatter().formatCellValue(row.getCell(2)) + " "; + rates = rates + "<br />"; + i++; + } + rates = rates + "</p>"; + transactionEvent.setRates(rates); + String transactionArea = "<p>"; + while (true) { + Row row = sheetAt.getRow(i); + if (row.getCell(0).getStringCellValue().equals("(四)经营许可(备案)事项程序运行图谱(附电子版)")) { + i = i + 1; + break; + } + transactionArea = transactionArea + new DataFormatter().formatCellValue(row.getCell(0)) + " " + + new DataFormatter().formatCellValue(row.getCell(1)) + " " + + new DataFormatter().formatCellValue(row.getCell(2)) + " "; + transactionArea = transactionArea + "<br />"; + i++; + } + transactionArea = transactionArea + "</p>"; + transactionEvent.setTransactionArea(transactionArea); + String handlingProcedures = "<p>"; + while (true) { + Row row = sheetAt.getRow(i); + if (row.getCell(0).getStringCellValue().equals("(五)经营许可(备案)事项实施内容一览表(附电子版)")) { + i = i + 1; + break; + } + handlingProcedures = handlingProcedures + new DataFormatter().formatCellValue(row.getCell(0)) + " " + + new DataFormatter().formatCellValue(row.getCell(1)) + " " + + new DataFormatter().formatCellValue(row.getCell(2)) + " "; + handlingProcedures = handlingProcedures + "<br />"; + i++; + } + handlingProcedures = handlingProcedures + "</p>"; + transactionEvent.setHandlingProcedures(handlingProcedures); + int ans; + if (isAdd) { + ans = baseMapper.insert(transactionEvent); + } else { + ans = baseMapper.updateById(transactionEvent); + } + if (ans <= 0) { + failNum++; + } + } + + } + if (failNum == 0) {// + return 3;//全部导入成功 + } else if (failNum < numberOfSheets) { + return 2;//部分导入成功 + } else if (failNum.equals(numberOfSheets)) { + return 0;//导入失败 + } + return 0; + } } diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java index 524fba5..ac9a187 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java @@ -12,6 +12,7 @@ import com.panzhihua.common.model.dtos.community.convenient.*; import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO; +import com.panzhihua.common.model.vos.community.convenient.ConvenientGoodsCategoryVO; import com.panzhihua.common.utlis.MimeTypeUtils; import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Value; @@ -397,4 +398,38 @@ return communityService.deletePoint(pointId, this.getUserId()); } + @ApiOperation(value = "新增商品分类") + @PostMapping("/goodsCategory/add") + public R addGoodsCategory(@RequestBody @Validated(AddGroup.class) ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) { + convenientGoodsCategoryDTO.setCreatedBy(this.getUserId()); + convenientGoodsCategoryDTO.setAreaCode(this.getAreaCode()); + return communityService.addGoodsCategory(convenientGoodsCategoryDTO); + } + + @ApiOperation(value = "编辑商品分类") + @PutMapping("/goodsCategory/put") + public R putGoodsCategory(@RequestBody @Validated(PutGroup.class) ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) { + convenientGoodsCategoryDTO.setUpdatedBy(this.getUserId()); + return communityService.putGoodsCategory(convenientGoodsCategoryDTO); + } + + @ApiOperation(value = "删除商品分类") + @DeleteMapping("/goodsCategory/delete") + public R deleteGoodsCategory(@RequestParam("categoryId") @ApiParam(value = "商品分类id", required = true) Long categoryId) { + return communityService.deleteGoodsCategory(categoryId, this.getUserId()); + } + + @ApiOperation(value = "查询商品分类详情", response = ConvenientGoodsCategoryVO.class) + @GetMapping("/goodsCategory/get") + public R getGoodsCategory(@RequestParam("categoryId") @ApiParam(value = "商品分类id", required = true) Long categoryId) { + return communityService.getGoodsCategory(categoryId); + } + + @ApiOperation(value = "分页查询商品分类", response = ConvenientGoodsCategoryVO.class) + @PostMapping("/goodsCategory/page") + public R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO) { + pageConvenientGoodsCategoryDTO.setAreaCode(this.getAreaCode()); + return communityService.pageGoodsCategory(pageConvenientGoodsCategoryDTO); + } + } diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java index 0bee419..a0bb02c 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java @@ -235,5 +235,10 @@ } + @GetMapping("/getAllCommunityList") + @ApiOperation(value = "获取当前账号下的社区/村落列表",response = StreetVO.class) + public R communityList(){ + return userService.getAllCommunityList(); + } } diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java index 8579ecc..43c141b 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java @@ -42,10 +42,6 @@ @NotBlank(groups = {AddGroup.class}, message = "微信账号不能为空") private String wechatAccount; - @ApiModelProperty("所属地区") - @NotBlank(groups = {AddGroup.class}, message = "所属地区不能为空") - private String region; - @ApiModelProperty("详细地址") @NotBlank(groups = {AddGroup.class}, message = "详细地址不能为空") private String address; diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientGoodsCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientGoodsCategoryDTO.java new file mode 100644 index 0000000..63f38ce --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientGoodsCategoryDTO.java @@ -0,0 +1,46 @@ +package com.panzhihua.common.model.dtos.community.convenient; + +import com.panzhihua.common.validated.AddGroup; +import com.panzhihua.common.validated.PutGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @title: ConvenientGoodsCategoryDTO + * @projectName: 成都呐喊信息技术有限公司-智慧社区项目 + * @description: 新增/编辑商品务分类 + * @author: yh + * @date: 2022-10-21 09:36:09 + */ +@Data +@ApiModel("新增/编辑商品务分类") +public class ConvenientGoodsCategoryDTO { + + @ApiModelProperty("分类ID") + @NotNull(groups = {PutGroup.class}, message = "分类id不能为空") + private Long id; + + @ApiModelProperty("分类名称") + @NotBlank(groups = {AddGroup.class}, message = "分类名称不能为空") + private String name; + + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("权重") + @NotNull(groups = {AddGroup.class}, message = "权重不能为空") + private Integer weight; + + @ApiModelProperty(value = "创建人", hidden = true) + private Long createdBy; + + @ApiModelProperty(value = "更新人", hidden = true) + private Long updatedBy; + + private String areaCode; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientGoodsCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientGoodsCategoryDTO.java new file mode 100644 index 0000000..4cc558f --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientGoodsCategoryDTO.java @@ -0,0 +1,28 @@ +package com.panzhihua.common.model.dtos.community.convenient; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @title: PageConvenientGoodsCategoryDTO + * @projectName: 成都呐喊信息技术有限公司-智慧社区项目 + * @description: 分页查询商品分类请求参数 + * @author: yh + * @date: 2022-10-21 09:36:09 + */ +@Data +@ApiModel("分页查询商品分类请求参数") +public class PageConvenientGoodsCategoryDTO { + + @ApiModelProperty("分类名称") + private String name; + + @ApiModelProperty(value = "分页-当前页数", example = "1") + private Long pageNum; + + @ApiModelProperty(value = "分页-每页记录数", example = "10") + private Long pageSize; + + private String areaCode; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java new file mode 100644 index 0000000..1b56d1a --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java @@ -0,0 +1,36 @@ +package com.panzhihua.common.model.dtos.shop; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @auther yh + * @create 2022-10-21 09:36:09 + * @describe 查询商品请求参数 + */ +@Data +@ApiModel("查询商品请求参数") +public class ComShopFlowerGoodsDTO { + + @ApiModelProperty(value = "分页-当前页数", example = "1") + private Long pageNum = 1L; + + @ApiModelProperty(value = "分页-每页记录数", example = "10") + private Long pageSize = 10L; + + @ApiModelProperty("商品名称") + private String name; + + @ApiModelProperty("店铺id") + private Long storeId; + + @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)") + private Integer status; + + @ApiModelProperty("配送方式(1.商家配送 2.快递物流)") + private Integer deliveryType; + + @ApiModelProperty(hidden = true) + private Long userId; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerGoodsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerGoodsDTO.java new file mode 100644 index 0000000..e55a350 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerGoodsDTO.java @@ -0,0 +1,31 @@ +package com.panzhihua.common.model.dtos.shop; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @auther yh + * @describe 分页查询商品 + */ +@ApiModel("分页查询商品") +@Data +public class PageComShopFlowerGoodsDTO { + + @ApiModelProperty(value = "商品名称") + private String name; + + @ApiModelProperty(value = "店铺名称") + private String storeName; + @ApiModelProperty(value = "店铺Id") + private Long storeId; + + @ApiModelProperty(value = "商品状态(1.出售中 2.已下架 3.回收站)", example = "1") + private Integer status; + + @ApiModelProperty(value = "分页-当前页数", example = "1") + private Long pageNum; + + @ApiModelProperty(value = "分页-每页记录数", example = "10") + private Long pageSize; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerStoreDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerStoreDTO.java new file mode 100644 index 0000000..aa51371 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerStoreDTO.java @@ -0,0 +1,34 @@ +package com.panzhihua.common.model.dtos.shop; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @auther yh + * @create 2022-10-21 09:36:09 + * @describe 分页查询店铺 + */ +@Data +@ApiModel("分页查询店铺") +public class PageComShopFlowerStoreDTO { + + @ApiModelProperty(value = "分页-当前页数", example = "1") + private Long pageNum = 1L; + @ApiModelProperty(value = "商家姓名") + private String contacts; + @ApiModelProperty(value = "商家账号") + private String account; + @ApiModelProperty(value = "店铺名称") + private String name; + @ApiModelProperty(value = "配送方式(1.自提 2.快递)") + private Integer deliveryType; + @ApiModelProperty(value = "店铺状态(1.启用 2.禁用)") + private Integer status; + + @ApiModelProperty(value = "分页-每页记录数", example = "10") + private Long pageSize = 10L; + + @ApiModelProperty("店铺id") + private Long storeId; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java index 44262d8..dda775c 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java @@ -37,11 +37,6 @@ @ApiModelProperty("社区名称") private String communityName; /** - * 所属地区 - */ - @ApiModelProperty("所属地区") - private String region; - /** * 提货点地址 */ @ApiModelProperty("提货点地址") diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientGoodsCategoryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientGoodsCategoryVO.java new file mode 100644 index 0000000..847f1b3 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientGoodsCategoryVO.java @@ -0,0 +1,40 @@ +package com.panzhihua.common.model.vos.community.convenient; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @title: ConvenientGoodsCategoryVO + * @projectName: 成都呐喊信息技术有限公司-智慧社区项目 + * @description: 商品分类信息 + * @author: yh + * @date: 2022-10-21 09:36:09 + */ +@Data +@ApiModel("商品分类信息") +public class ConvenientGoodsCategoryVO { + + @ApiModelProperty("分类ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @ApiModelProperty("分类名称") + private String name; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("权重") + private Integer weight; + + @ApiModelProperty("创建人") + private String createdBy; + + @ApiModelProperty("创建时间") + private Date createdAt; +} \ No newline at end of file diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java new file mode 100644 index 0000000..f6db251 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java @@ -0,0 +1,30 @@ +package com.panzhihua.common.model.vos.shop; + +import com.panzhihua.common.validated.AddGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Digits; +import javax.validation.constraints.Min; +import java.math.BigDecimal; + +/** + * @auther yh + * @describe + */ +@Data +@ApiModel("商品规格") +public class AddShopFlowerGoodsAttrVO { + + @ApiModelProperty("商品规格Id:编辑必传") + private Long goodsAttrId; + + @ApiModelProperty("商品规格") + private String goodsAttr; + + @ApiModelProperty("规格价格") + @Min(groups = {AddGroup.class}, value = 0, message = "价格最小值为0") + @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2) + private BigDecimal attrPrice; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java new file mode 100644 index 0000000..c62cc57 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java @@ -0,0 +1,57 @@ +package com.panzhihua.common.model.vos.shop; + +import com.panzhihua.common.validated.AddGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.Valid; +import javax.validation.constraints.Digits; +import javax.validation.constraints.Min; +import java.math.BigDecimal; +import java.util.List; + +/** + * @auther yh + * @describe 商品 + */ +@Data +@ApiModel("添加商品") +public class AddShopFlowerGoodsVO { + + @ApiModelProperty("店铺id") + private Long storeId; + + @ApiModelProperty("商品名称") + private String name; + + @ApiModelProperty("商品现价") + @Min(groups = {AddGroup.class}, value = 0, message = "价格最小值为0") + @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2) + private BigDecimal price; + + @ApiModelProperty("商品单位") + private String unit; + + @ApiModelProperty("商品状态(1.上架 2.已下架 3.回收站)") + private Integer status; + + @ApiModelProperty("商品主图") + private String goodsPic; + + @ApiModelProperty("商品图片") + private String images; + + @ApiModelProperty("商品详情") + private String details; + + /** + * 配送方式(1.商家配送 2.快递物流) + */ + @ApiModelProperty(value = "配送方式(1.自提 2.快递)", hidden = true) + private Integer deliveryType; + + @ApiModelProperty("商品规格") + @Valid + private List<AddShopFlowerGoodsAttrVO> goodsAttrVOList; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsAttrVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsAttrVO.java new file mode 100644 index 0000000..1f0d6f3 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsAttrVO.java @@ -0,0 +1,89 @@ +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 yh + * @create 2022-10-21 09:36:09 + * @describe 商品规格信息 + */ +@Data +@ApiModel("商品规格信息") +public class ComShopFlowerGoodsAttrVO { + + /** + * 商品规格id + */ + @ApiModelProperty("商品规格id") + private Long id; + + /** + * 商品id + */ + @ApiModelProperty("商品id") + private Long goodsId; + + /** + * 店铺id + */ + @ApiModelProperty("店铺id") + private Long storeId; + + /** + * 商品名称 + */ + @ApiModelProperty("商品名称") + private String goodsName; + + /** + * 商品规格 + */ + @ApiModelProperty("商品规格") + private String goodsAttrName; + + /** + * 商品规格库存 + */ + @ApiModelProperty("商品规格库存") + private Integer stock; + + /** + * 商品规格销量 + */ + @ApiModelProperty("商品规格销量") + private Integer sale; + + /** + * 商品规格图 + */ + @ApiModelProperty("商品规格图") + private String attrPic; + + /** + * 是否是默认规格(1.是 2.否) + */ + @ApiModelProperty("是否是默认规格(1.是 2.否)") + private Integer isDefault; + + /** + * 规格价格 + */ + @ApiModelProperty("规格价格") + private BigDecimal price; + + + /** + * 包邮价 + */ + @ApiModelProperty("包邮价") + private BigDecimal freeShippingPrice; + /** + * 拼单价 + */ + @ApiModelProperty("拼单价") + private BigDecimal collatePrice; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java new file mode 100644 index 0000000..bc904a6 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java @@ -0,0 +1,120 @@ +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.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @auther yh + * @create 2022-10-21 09:36:09 + * @describe 商品信息 + */ +@Data +@ApiModel("商品信息") +public class ComShopFlowerGoodsVO { + + /** + * 商品id + */ + @ApiModelProperty("商品id") + private Long id; + + /** + * 商品名称 + */ + @ApiModelProperty("商品名称") + private String name; + + /** + * 店铺id + */ + @ApiModelProperty("店铺id") + private Long storeId; + + /** + * 商品主图 + */ + @ApiModelProperty("商品主图") + private String goodsPic; + + /** + * 商品展示图 + */ + @ApiModelProperty("商品展示图") + private String images; + + /** + * 商品状态(1.出售中 2.已下架 3.回收站) + */ + @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; + + /** + * 配送方式(1.商家配送 2.快递物流) + */ + @ApiModelProperty("配送方式(1.商家配送 2.快递物流)") + private Integer deliveryType; + + /** + * 商品规格列表 + */ + @ApiModelProperty("商品规格列表") + private List<ComShopGoodsAttrVO> goodsAttrList; + + /** + * 店铺信息 + */ + @ApiModelProperty("商品店铺信息") + private PageShopStoreVO shopStoreVO; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createAt; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopFlowerGoodsVO.java new file mode 100644 index 0000000..0fb9eaa --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopFlowerGoodsVO.java @@ -0,0 +1,84 @@ +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 yh + * @describe * @describe 商品VO + */ +@Data +@ApiModel("商品") +public class PageShopFlowerGoodsVO { + + @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<AddShopFlowerGoodsAttrVO> goodsAttrs; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java index bee9f46..b02143a 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java @@ -10513,9 +10513,47 @@ @DeleteMapping("/point/delete") R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator); + /** - * 统计问题清单 - * */ + * 新增商品分类 + * @param convenientGoodsCategoryDTO + * @return + */ + @PostMapping("/goodsCategory/add") + R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO); + + /** + * 编辑 + * @param convenientGoodsCategoryDTO + * @return + */ + @PutMapping("/goodsCategory/put") + R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO); + + /** + * 删除商品分类 + * @param categoryId + * @return + */ + @DeleteMapping("/goodsCategory/delete") + R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator); + + /** + * 获取商品分类详情 + * @param categoryId + * @return + */ + @GetMapping("/goodsCategory/get") + R getGoodsCategory(@RequestParam("categoryId") Long categoryId); + + /** + * 分页查询商品分类 + * @param pageConvenientGoodsCategoryDTO + * @return + */ + @PostMapping("/goodsCategory/page") + R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO); + @GetMapping("/dataCount") R dataCount(); diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java index 02702c8..e76097b 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java @@ -1305,7 +1305,6 @@ R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO); - /** * 是否为专家登陆小程序 * */ @@ -1326,4 +1325,12 @@ @GetMapping("/myFeedBack") R myFeedBack(@RequestParam("userId") Long userId,@RequestParam(value = "type",required = false)Integer type); + + /** + * 获取所有社区等 + * @return + */ + @GetMapping("/getAllCommunityList") + R getAllCommunityList(); + } diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java index 544269a..8d3287d 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java @@ -64,6 +64,9 @@ @Resource private ConvenientElevatingPointService convenientElevatingPointService; + @Resource + private ConvenientGoodsCategoryService convenientGoodsCategoryService; + /** * 社区后台分页查询便民服务商家 * @@ -739,5 +742,55 @@ @DeleteMapping("/point/delete") public R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator) { return convenientElevatingPointService.deletePoint(pointId,operator); -} + } + + /** + * 新增商品分类 + * @param convenientGoodsCategoryDTO + * @return + */ + @PostMapping("/goodsCategory/add") + public R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) { + return convenientGoodsCategoryService.addGoodsCategory(convenientGoodsCategoryDTO); + } + + /** + * 编辑 + * @param convenientGoodsCategoryDTO + * @return + */ + @PutMapping("/goodsCategory/put") + public R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) { + return convenientGoodsCategoryService.putGoodsCategory(convenientGoodsCategoryDTO); + } + + /** + * 删除商品分类 + * @param categoryId + * @return + */ + @DeleteMapping("/goodsCategory/delete") + public R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator) { + return convenientGoodsCategoryService.deleteGoodsCategoryById(categoryId, operator); + } + + /** + * 获取商品分类详情 + * @param categoryId + * @return + */ + @GetMapping("/goodsCategory/get") + public R getGoodsCategory(@RequestParam("categoryId") Long categoryId) { + return convenientGoodsCategoryService.getGoodsCategoryById(categoryId); + } + + /** + * 分页查询商品分类 + * @param pageConvenientGoodsCategoryDTO + * @return + */ + @PostMapping("/goodsCategory/page") + public R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO) { + return convenientGoodsCategoryService.pageGoodsCategory(pageConvenientGoodsCategoryDTO); + } } diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java new file mode 100644 index 0000000..ee40f41 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java @@ -0,0 +1,24 @@ +package com.panzhihua.service_community.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsAttrVO; +import com.panzhihua.common.model.vos.shop.ComShopGoodsAttrVO; +import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsAttrDO; +import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @auther yh + * @create 2022-10-21 09:36:09 + * @describe 商品规格表mapper类 + */ +@Mapper +public interface ComShopFlowerGoodsAttrDAO extends BaseMapper<ComShopFlowerGoodsAttrDO> { + + List<ComShopFlowerGoodsAttrVO> getGoodsAttr(@Param("goodsId") Long goodsId); + +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java new file mode 100644 index 0000000..a230662 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java @@ -0,0 +1,41 @@ +package com.panzhihua.service_community.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.panzhihua.common.model.dtos.shop.*; +import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO; +import com.panzhihua.common.model.vos.shop.ComShopGoodsVO; +import com.panzhihua.common.model.vos.shop.PageShopGoodsVO; +import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @auther yh + * @create 2022-10-21 09:36:09 + * @describe 商品表mapper类 + */ +@Mapper +public interface ComShopFlowerGoodsDAO extends BaseMapper<ComShopFlowerGoodsDO> { + + IPage<ComShopFlowerGoodsVO> pageShopGoods(@Param("page") Page page, @Param("pageComShopFlowerGoodsDTO") PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO); + + /** + * 根据店铺id查询商品列表 + * + * @param page 分页参数 + * @param pageComShopFlowerStoreDTO 请求参数 + * @return 分页商品列表 + */ + IPage<ComShopFlowerGoodsVO> pageShopGoodsByStoreId(@Param("page") Page page, @Param("pageComShopFlowerStoreDTO") PageComShopFlowerStoreDTO pageComShopFlowerStoreDTO); + + /** + * 分页查询商品列表 + * + * @param page 分页参数 + * @param comShopFlowerGoodsDTO 请求参数 + * @return 商品列表 + */ + IPage<ComShopFlowerGoodsVO> pageShopGoodByApps(@Param("page") Page page, @Param("comShopFlowerGoodsDTO") ComShopFlowerGoodsDTO comShopFlowerGoodsDTO); +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientGoodsCategoryDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientGoodsCategoryDAO.java new file mode 100644 index 0000000..13ffae9 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientGoodsCategoryDAO.java @@ -0,0 +1,60 @@ +package com.panzhihua.service_community.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.panzhihua.common.model.dtos.community.convenient.PageConvenientGoodsCategoryDTO; +import com.panzhihua.common.model.vos.community.convenient.ConvenientGoodsCategoryVO; +import com.panzhihua.service_community.model.dos.ConvenientGoodsCategoryDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @ClassName: ConvenientGoodsCategoryDAO + * @Author: yh + * @Date: 2022/11/8 13:20 + * @Description: 商品分类 + */ +@Mapper +public interface ConvenientGoodsCategoryDAO extends BaseMapper<ConvenientGoodsCategoryDO> { + + /** + * 分页查询便民服务分类 + * + * @param page 分页参数 + * @param pageConvenientGoodsCategoryDTO + * @return 服务分类详情 + */ + IPage<ConvenientGoodsCategoryVO> pageGoodsCategory(@Param("page") Page page, @Param("pageConvenientGoodsCategoryDTO") + PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO); + + /** + * 删除商家服务类型关系 + * @param goodsId + * @return + */ + int deleteGoodsCategoryRelation(@Param("goodsId") Long goodsId); + + /** + * 获取商家服务范围 + * @param goodsId + * @return + */ + String selectCategoryScopeByGoodsId(@Param("goodsId") Long goodsId); + + /** + * 获取商家服务类型 + * @param goodsId + * @return serviceIds + */ + List<Long> selectCategoryIdsForGoods(@Param("goodsId") Long goodsId); + + /** + * 查看服务分类是否被引用 + * @param categoryId + * @return + */ + int checkCategoryIsUsing(@Param("categoryId") Long categoryId); +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsAttrDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsAttrDO.java new file mode 100644 index 0000000..e7f0bb3 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsAttrDO.java @@ -0,0 +1,114 @@ +package com.panzhihua.service_community.model.dos; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @auther yh + * @create 2022-10-21 09:36:09 + * @describe 商品规格表实体类 + */ + +@Data +@TableName("com_shop_flower_goods_attr") +public class ComShopFlowerGoodsAttrDO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 商品规格id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 商品id + */ + private Long goodsId; + + /** + * 店铺id + */ + private Long storeId; + + /** + * 商品名称 + */ + private String goodsName; + + /** + * 规格名称 + */ + private String goodsAttrName; + + /** + * 商品规格库存 + */ + private Integer stock; + + /** + * 商品规格销量 + */ + private Integer sale; + + /** + * 商品规格图 + */ + private String attrPic; + + /** + * 是否是默认规格(1.是 2.否) + */ + private Integer isDefault; + + /** + * 规格价格 + */ + private BigDecimal price; + + /** + * 包邮价 + */ + private BigDecimal freeShippingPrice; + /** + * 拼单价 + */ + private BigDecimal collatePrice; + + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createAt; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.UPDATE) + private Date updateAt; + + @Override + public String toString() { + return "ComShopFlowerGoodsAttrDO{" + + "id=" + id + + ", goodsId=" + goodsId + + ", storeId=" + storeId + + ", goodsName='" + goodsName + '\'' + + ", goodsAttrName='" + goodsAttrName + '\'' + + ", stock=" + stock + + ", sale=" + sale + + ", attrPic='" + attrPic + '\'' + + ", isDefault=" + isDefault + + ", price=" + price + + ", freeShippingPrice=" + freeShippingPrice + + ", collatePrice=" + collatePrice + + ", createAt=" + createAt + + ", updateAt=" + updateAt + + '}'; + } +} \ No newline at end of file diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsDO.java new file mode 100644 index 0000000..f6846ac --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsDO.java @@ -0,0 +1,162 @@ +package com.panzhihua.service_community.model.dos; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @auther yh + * @create 2022-10-21 09:36:09 + * @describe 商品表实体类 + */ + +@Data +@TableName("com_shop_flower_goods") +public class ComShopFlowerGoodsDO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 商品id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 商品分类id + */ + private Long typeId; + + /** + * 商品名称 + */ + @TableField("`name`") + private String name; + + /** + * 店铺id + */ + private Long storeId; + + /** + * 商品主图 + */ + private String goodsPic; + + /** + * 商品展示图 + */ + private String images; + + /** + * 商品状态(1.出售中 2.已下架 3.回收站) + */ + @TableField("`status`") + private Integer status; + + /** + * 商品销量 + */ + private Integer sale; + + /** + * 商品原价 + */ + private BigDecimal originalPrice; + + /** + * 商品现价 + */ + private BigDecimal price; + + /** + * 商品单位 + */ + private String unit; + + /** + * 商品排序 + */ + @TableField("`order`") + private Integer order; + + /** + * 商品总库存 + */ + private Integer stock; + + /** + * 商品详情 + */ + private String details; + + /** + * 商品备注 + */ + private String remark; + + /** + * 商品描述 + */ + private String goodsDescribe; + + /** + * 配送方式(1.自提 2.快递) + */ + private Integer deliveryType; + + /** + * 删除状态(1.未删除 2.已删除) + */ + private Integer deleteStatus; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createAt; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.UPDATE) + private Date updateAt; + + @Override + public String toString() { + return "ComShopGoodsDO{" + "id=" + id + ", typeId=" + typeId + ", name=" + name + ", storeId=" + storeId + + ", goodsPic=" + goodsPic + ", images=" + images + ", status=" + status + ", sale=" + sale + + ", originalPrice=" + originalPrice + ", price=" + price + ", unit=" + unit + ", order=" + order + + ", stock=" + stock + ", details=" + details + ", remark=" + remark + ", goodsDescribe=" + goodsDescribe + + ", deliveryType=" + deliveryType + ", deleteStatus=" + deleteStatus + ", createAt=" + createAt + + ", updateAt=" + updateAt + "}"; + } + + /** + * 商品状态(1.上架 2.已下架 3.回收站) + */ + public interface status { + int sell = 1; + int lower = 2; + int recovery = 3; + } + + /** + * 删除状态(1.未删除 2.已删除) + */ + public interface deleteStatus { + int no = 1; + int yes = 2; + } + + /** + * 配送方式(1.自提 2.快递) + */ + public interface deliveryType { + int store = 1; + int express = 2; + } +} \ No newline at end of file diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java index 57980cc..6c0223c 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java @@ -37,10 +37,6 @@ */ private String communityName; /** - * 所属地区 - */ - private String region; - /** * 提货点地址 */ private String address; diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java new file mode 100644 index 0000000..b4f6790 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java @@ -0,0 +1,67 @@ +package com.panzhihua.service_community.model.dos; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @title: ConvenientGoodsCategoryDO + * @projectName: 成都呐喊信息技术有限公司-智慧社区项目 + * @description: 商品分类DO + * @author: yh + * @date: 2022-10-21 09:36:09 + */ +@Data +@TableName(value = "com_convenient_goods_categories") +public class ConvenientGoodsCategoryDO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 分类名称 + */ + private String name; + /** + * 分类图标 + */ + private String icon; + /** + * 备注 + */ + private String remark; + /** + * 权重 + */ + private Integer weight; + /** + * 是否删除 + */ + private Boolean isDel; + /** + * 创建时间 + */ + private Date createdAt; + /** + * 创建人 + */ + private Long createdBy; + /** + * 更新时间 + */ + private Date updatedAt; + /** + * 更新人 + */ + private Long updatedBy; + + private String areaCode; +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientGoodsCategoryService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientGoodsCategoryService.java new file mode 100644 index 0000000..db82cfe --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientGoodsCategoryService.java @@ -0,0 +1,70 @@ +package com.panzhihua.service_community.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.panzhihua.common.model.dtos.community.convenient.ConvenientGoodsCategoryDTO; +import com.panzhihua.common.model.dtos.community.convenient.PageConvenientGoodsCategoryDTO; +import com.panzhihua.common.model.vos.R; +import com.panzhihua.service_community.model.dos.ConvenientGoodsCategoryDO; + +/** + * @title: ConvenientGoodsCategoryService + * @projectName: 成都呐喊信息技术有限公司-智慧社区项目 + * @description: 便民服务分类服务类 + * @author: hans + * @date: 2021/09/16 10:31 + */ +public interface ConvenientGoodsCategoryService extends IService<ConvenientGoodsCategoryDO> { + /** + * 便民服务新增分类 + * + * @param convenientGoodsCategoryDTO + * @return 新增结果 + */ + R addGoodsCategory(ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO); + + /** + * 便民服务分类编辑 + * + * @param convenientGoodsCategoryDTO + * @return 修改结果 + */ + R putGoodsCategory(ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO); + + /** + * 便民服务分类删除 + * + * @param categoryId 便民服务分类id + * @param operator 操作人员 + * @return 删除结果 + */ + R deleteGoodsCategoryById(Long categoryId, Long operator); + + /** + * 获取便民服务分类详情 + * + * @param categoryId 便民服务分类id + * @return 分类详情 + */ + R getGoodsCategoryById(Long categoryId); + + /** + * 分页查询便民服务分类 + * + * @param pageConvenientGoodsCategoryDTO + * @return 分类详情 + */ + R pageGoodsCategory(PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO); + + /** + * 获取所有便民服务分类 + * + * @return + */ + R getAllGoodsCategories(String areaCode); + + /** + * 获取该社区商家数量大于0的分类 + * @param communityId + * @return + */ +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientGoodsCategoryServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientGoodsCategoryServiceImpl.java new file mode 100644 index 0000000..b0c8e61 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientGoodsCategoryServiceImpl.java @@ -0,0 +1,127 @@ +package com.panzhihua.service_community.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.community.convenient.ConvenientGoodsCategoryDTO; +import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO; +import com.panzhihua.common.model.dtos.community.convenient.PageConvenientGoodsCategoryDTO; +import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO; +import com.panzhihua.common.model.vos.R; +import com.panzhihua.common.model.vos.community.convenient.ConvenientGoodsCategoryVO; +import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO; +import com.panzhihua.service_community.dao.ConvenientGoodsCategoryDAO; +import com.panzhihua.service_community.dao.ConvenientServiceCategoryDAO; +import com.panzhihua.service_community.model.dos.ConvenientGoodsCategoryDO; +import com.panzhihua.service_community.model.dos.ConvenientServiceCategoryDO; +import com.panzhihua.service_community.service.ConvenientGoodsCategoryService; +import com.panzhihua.service_community.service.ConvenientServiceCategoryService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static java.util.Objects.isNull; + +/** + * @title: ConvenientGoodsCategoryServiceImpl + * @projectName: 成都呐喊信息技术有限公司-智慧社区项目 + * @description: 商品分类服务实现类 + * @author: yh + * @date: 2022-10-21 09:36:09 + */ +@Service +public class ConvenientGoodsCategoryServiceImpl extends ServiceImpl<ConvenientGoodsCategoryDAO, ConvenientGoodsCategoryDO> + implements ConvenientGoodsCategoryService { + + @Override + public R addGoodsCategory(ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) { + ConvenientGoodsCategoryDO convenientGoodsCategoryDO = new ConvenientGoodsCategoryDO(); + BeanUtils.copyProperties(convenientGoodsCategoryDTO, convenientGoodsCategoryDO); + convenientGoodsCategoryDO.setCreatedAt(new Date()); + int result = this.baseMapper.insert(convenientGoodsCategoryDO); + if (result > 0) { + return R.ok(); + } + return R.fail("添加失败"); + } + + @Override + public R putGoodsCategory(ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) { + ConvenientGoodsCategoryDO convenientGoodsCategoryDO = this.baseMapper.selectById(convenientGoodsCategoryDTO.getId()); + if (isNull(convenientGoodsCategoryDO)) { + return R.fail("分类id不存在"); + } + BeanUtils.copyProperties(convenientGoodsCategoryDTO, convenientGoodsCategoryDO); + int result = this.baseMapper.updateById(convenientGoodsCategoryDO); + if (result > 0) { + return R.ok(); + } + return R.fail("更新失败"); + } + + @Override + public R deleteGoodsCategoryById(Long categoryId, Long operator) { + if (isNull(categoryId)) { + return R.fail("分类id不能为空"); + } + ConvenientGoodsCategoryDO convenientGoodsCategoryDO = this.baseMapper.selectById(categoryId); + if (isNull(convenientGoodsCategoryDO)) { + return R.fail("分类id不存在"); + } + int count = this.baseMapper.checkCategoryIsUsing(categoryId); + if (count > 0) { + return R.fail("该分类名称已被引用,无法删除!"); + } + convenientGoodsCategoryDO.setIsDel(true); + convenientGoodsCategoryDO.setUpdatedBy(operator); + int result = this.baseMapper.updateById(convenientGoodsCategoryDO); + if (result > 0) { + return R.ok(); + } + return R.fail("删除失败"); + } + + @Override + public R getGoodsCategoryById(Long goodsId) { + if (isNull(goodsId)) { + return R.fail("分类id不能为空"); + } + ConvenientGoodsCategoryDO convenientGoodsCategoryDO = this.baseMapper.selectById(goodsId); + if (isNull(convenientGoodsCategoryDO)) { + return R.fail("分类id不存在"); + } + ConvenientGoodsCategoryVO convenientGoodsCategoryVO = new ConvenientGoodsCategoryVO(); + BeanUtils.copyProperties(convenientGoodsCategoryDO, convenientGoodsCategoryVO); + return R.ok(convenientGoodsCategoryVO); + } + + @Override + public R pageGoodsCategory(PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO) { + Page page = new Page<>(); + page.setSize(pageConvenientGoodsCategoryDTO.getPageSize()); + page.setCurrent(pageConvenientGoodsCategoryDTO.getPageNum()); + IPage<ConvenientGoodsCategoryVO> iPage = this.baseMapper.pageGoodsCategory(page, pageConvenientGoodsCategoryDTO); + return R.ok(iPage); + } + + @Override + public R getAllGoodsCategories(String areaCode) { + List<ConvenientGoodsCategoryVO> categoryVOList = new ArrayList<>(); + List<ConvenientGoodsCategoryDO> categoryDOS = this.baseMapper.selectList(new QueryWrapper<ConvenientGoodsCategoryDO>() + .lambda().eq(ConvenientGoodsCategoryDO::getAreaCode,areaCode).orderByDesc(ConvenientGoodsCategoryDO::getWeight)); + if (!ObjectUtils.isEmpty(categoryDOS)) { + categoryDOS.forEach(categoryDO -> { + ConvenientGoodsCategoryVO categoryVO = new ConvenientGoodsCategoryVO(); + BeanUtils.copyProperties(categoryDO, categoryVO); + categoryVOList.add(categoryVO); + }); + } + return R.ok(categoryVOList); + } + +} diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml index 58c1684..df0b6fe 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml @@ -7,7 +7,6 @@ <result column="name" jdbcType="VARCHAR" property="name"/> <result column="community_id" jdbcType="BIGINT" property="communityId"/> <result column="community_name" jdbcType="VARCHAR" property="communityName"/> - <result column="region" jdbcType="VARCHAR" property="region"/> <result column="address" jdbcType="VARCHAR" property="address"/> <result column="contacts" jdbcType="VARCHAR" property="contacts"/> <result column="phone" jdbcType="VARCHAR" property="phone"/> @@ -25,7 +24,7 @@ <result column="updated_by" jdbcType="BIGINT" property="updatedBy"/> </resultMap> <sql id="Base_Column_List"> - id, `name`, community_id, community_name, region, address, contacts, phone, wechat_account, + id, `name`, community_id, community_name, address, contacts, phone, wechat_account, lat, lon, `business_status`, cumulative_goods_num, prepare_goods_num, already_goods_num, is_del, created_at, created_by, updated_at, updated_by </sql> diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsAttrMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsAttrMapper.xml new file mode 100644 index 0000000..3beae4c --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsAttrMapper.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerGoodsAttrDAO"> + <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerGoodsAttrDO"> + <!--@mbg.generated--> + <!--@Table com_shop_flower_goods_attr--> + <id column="id" jdbcType="BIGINT" property="id"/> + <result column="goods_id" jdbcType="BIGINT" property="goodsId"/> + <result column="store_id" jdbcType="BIGINT" property="storeId"/> + <result column="goods_name" jdbcType="VARCHAR" property="goodsName"/> + <result column="goods_attr_name" jdbcType="VARCHAR" property="goodsAttrName"/> + <result column="stock" jdbcType="INTEGER" property="stock"/> + <result column="sale" jdbcType="INTEGER" property="sale"/> + <result column="attr_pic" jdbcType="VARCHAR" property="attrPic"/> + <result column="is_default" jdbcType="TINYINT" property="isDefault"/> + <result column="price" jdbcType="DECIMAL" property="price"/> + <result column="free_shipping_price" jdbcType="DECIMAL" property="freeShippingPrice"/> + <result column="collate_price" jdbcType="DECIMAL" property="collatePrice"/> + <result column="create_at" jdbcType="TIMESTAMP" property="createAt"/> + <result column="update_at" jdbcType="TIMESTAMP" property="updateAt"/> + </resultMap> + <sql id="Base_Column_List"> + <!--@mbg.generated--> + id, goods_id, store_id, goods_name, goods_attr_name, stock, sale, attr_pic, is_default, + price, free_shipping_price, collate_price, create_at, update_at + </sql> + <select id="getGoodsAttr" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsAttrVO"> + select <include refid="Base_Column_List"/> from com_shop_flower_goods_attr where goods_id = #{goodsId} + </select> +</mapper> \ No newline at end of file diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml new file mode 100644 index 0000000..05f7e03 --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerGoodsDAO"> + <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO"> + <!--@mbg.generated--> + <!--@Table com_shop_flower_goods--> + <id column="id" jdbcType="BIGINT" property="id"/> + <result column="type_id" jdbcType="BIGINT" property="typeId"/> + <result column="name" jdbcType="VARCHAR" property="name"/> + <result column="store_id" jdbcType="BIGINT" property="storeId"/> + <result column="goods_pic" jdbcType="VARCHAR" property="goodsPic"/> + <result column="images" jdbcType="VARCHAR" property="images"/> + <result column="status" jdbcType="TINYINT" property="status"/> + <result column="sale" jdbcType="INTEGER" property="sale"/> + <result column="original_price" jdbcType="DECIMAL" property="originalPrice"/> + <result column="price" jdbcType="DECIMAL" property="price"/> + <result column="unit" jdbcType="VARCHAR" property="unit"/> + <result column="order" jdbcType="INTEGER" property="order"/> + <result column="stock" jdbcType="INTEGER" property="stock"/> + <result column="details" jdbcType="LONGVARCHAR" property="details"/> + <result column="remark" jdbcType="VARCHAR" property="remark"/> + <result column="goods_describe" jdbcType="VARCHAR" property="goodsDescribe"/> + <result column="delivery_type" jdbcType="TINYINT" property="deliveryType"/> + <result column="delete_status" jdbcType="TINYINT" property="deleteStatus"/> + <result column="create_at" jdbcType="TIMESTAMP" property="createAt"/> + <result column="update_at" jdbcType="TIMESTAMP" property="updateAt"/> + </resultMap> + <sql id="Base_Column_List"> + <!--@mbg.generated--> + 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 + </sql> + <select id="pageShopGoods" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO"> + select c.id,c.type_id,ccm.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_flower_goods c + left join com_convenient_merchants ccm on c.store_id=ccm.id + <where>and + <if test='pageComShopFlowerGoodsDTO.storeName != null and pageComShopFlowerGoodsDTO.storeName.trim() != ""'> + c.delete_status = 1 and ccm.id_del = 0 + and ccm.name like concat('%',#{pageComShopFlowerGoodsDTO.storeName},'%') + </if> + <if test='pageComShopFlowerGoodsDTO.name != null and pageComShopFlowerGoodsDTO.name.trim() != ""'>and c.name + like concat('%',#{pageComShopFlowerGoodsDTO.name},'%') + </if> + <if test='pageComShopFlowerGoodsDTO.storeId != null'>and ccm.id=#{pageComShopFlowerGoodsDTO.storeId} + </if> + <if test='pageComShopFlowerGoodsDTO.status != null'>and c.status like + concat('%',#{pageComShopFlowerGoodsDTO.status},'%') + </if> + </where> + order by c.create_at desc + </select> + <select id="pageShopGoodsByStoreId" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO"> + select id,`name`,store_id,goods_pic,images,`status`,sale,original_price,price + ,unit,`order`,stock,details,delivery_type from com_shop_flower_goods where store_id = + #{pageComShopFlowerStoreDTO.storeId} + and delete_status = 1 and status = 1 order by sale desc,create_at desc + </select> + <select id="pageShopGoodByApps" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO"> + select csg.id,csg.`name`,csg.store_id,csg.goods_pic,csg.images,csg.`status`,csg.sale,csg.original_price + ,csg.price,csg.unit,csg.`order`,csg.stock,csg.details,csg.delivery_type, csg.create_at from com_shop_flower_goods as + csg left join com_convenient_merchants as css on css.id = csg.store_id where 1=1 and csg.delete_status = 1 and + css.`business_status` = 0 + <if test='comShopFlowerGoodsDTO.name != null and comShopFlowerGoodsDTO.name !=""'> + AND csg.`name` like concat('%',#{comShopFlowerGoodsDTO.name},'%') + </if> + <if test='comShopFlowerGoodsDTO.status != null '>AND csg.`status` = #{comShopFlowerGoodsDTO.status}</if> + <if test='comShopFlowerGoodsDTO.storeId != null '>AND csg.store_id = #{comShopFlowerGoodsDTO.storeId}</if> + <if test='comShopFlowerGoodsDTO.status != null '>AND csg.status = #{comShopFlowerGoodsDTO.status}</if> + <if test='comShopFlowerGoodsDTO.deliveryType != null '>AND csg.delivery_type = #{comShopFlowerGoodsDTO.deliveryType}</if> + order by sale desc,create_at desc + </select> +</mapper> \ No newline at end of file diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientGoodsCategoryMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientGoodsCategoryMapper.xml new file mode 100644 index 0000000..9dcdcba --- /dev/null +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientGoodsCategoryMapper.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.panzhihua.service_community.dao.ConvenientGoodsCategoryDAO"> + + <!-- 通用查询映射结果 --> + <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ConvenientGoodsCategoryDO"> + <id column="id" property="id"/> + <id column="name" property="name"/> + <id column="icon" property="icon"/> + <id column="remark" property="remark"/> + <id column="weight" property="weight"/> + <id column="is_del" property="isDel"/> + <id column="created_at" property="createdAt"/> + <id column="created_by" property="createdBy"/> + <id column="updated_at" property="updatedAt"/> + <id column="updated_by" property="updatedBy"/> + </resultMap> + + <!-- 通用查询结果列 --> + <sql id="Base_Column_List"> + id,`name`,icon,remark,weight,is_del,created_at,created_by,updated_at,updated_by + </sql> + + <select id="pageGoodsCategory" + resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientGoodsCategoryVO"> + SELECT + <include refid="Base_Column_List"/> + FROM com_convenient_service_categories + WHERE is_del = 0 + <if test="pageConvenientGoodsCategoryDTO.name != null and pageConvenientGoodsCategoryDTO.name.trim() != """> + AND `name` LIKE concat('%', #{pageConvenientGoodsCategoryDTO.name}, '%' ) + </if> + <if test="pageConvenientGoodsCategoryDTO.areaCode != null and pageConvenientGoodsCategoryDTO.areaCode.trim() != """> + AND area_code = #{pageConvenientGoodsCategoryDTO.areaCode} + </if> + ORDER BY weight DESC + </select> + <delete id="deleteGoodsCategoryRelation"> + DELETE FROM com_convenient_goods_scope WHERE goods_id = #{goodsId} + </delete> + <select id="selectCategoryScopeByGoodsId" resultType="java.lang.String"> + SELECT GROUP_CONCAT(`goods_category_name`) serviceScope FROM com_convenient_goods_scope WHERE goods_id = #{goodsId} + </select> + <select id="selectCategoryIdsForGoods" resultType="java.lang.Long"> + SELECT goods_category_id FROM com_convenient_goods_scope WHERE goods_id = #{goodsId} + </select> + <select id="checkCategoryIsUsing" resultType="java.lang.Integer"> + SELECT COUNT(1) FROM com_convenient_goods_scope WHERE goods_category_id = #{categoryId} + </select> + +</mapper> \ No newline at end of file diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java index da84237..6c33fee 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java @@ -1457,6 +1457,11 @@ return userService.getCommunityList(name,id); } + @GetMapping("/getAllCommunityList") + public R getAllCommunityList(){ + return userService.getAllCommunityList(); + } + @GetMapping("/resetPasswordAccount") public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){ return userService.resetPassword(type,account,appId); diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java index 1269a08..a200dca 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java @@ -916,6 +916,12 @@ R getCommunityList(String name,Long id); /** + * 获取所有城镇或村落列表 + * @return + */ + R getAllCommunityList(); + + /** * 重置密码 * @param type * @param account diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java index bbab1d7..6562c08 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java @@ -3707,6 +3707,27 @@ } @Override + public R getAllCommunityList() { + List<Integer> areaList = areaCodeList(); + List<AreaVOS> areaVOList = new ArrayList<>(); + for (Integer code : areaList) { + AreaVOS areaVO = new AreaVOS(); + areaVO.setId(code); + areaVO.setName(areaCodeToName(code.longValue())); + List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code); + Iterator<StreetVOS> iterator = streetVOS.listIterator(); + while (iterator.hasNext()) { + StreetVOS vo = iterator.next(); + List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3); + vo.setChildList(communityVOS); + + } + areaVO.setChildList(streetVOS); + areaVOList.add(areaVO); + } + return R.ok(areaVOList); + } + @Override public R getCommunityList(String name, Long id) { //区级账号名 String[] streetList = {"bingcaogangjiedao", "donghuajiedao", "nongnongpingjiedao", "dadukoujiedaojiedao", "guazipingjiedao", @@ -3714,7 +3735,7 @@ "jingjiangzhen", "renhezhen", "pingdizhen", "datianzhen", "tongdezhen", "futianzhen", "qianjinzhen", "panlianzhen", "binguzhen", "baimazhen", "salianzhen", "puweizhen", "deshizhen", "wanqiuyizuxiang", "caochangzhen", "xinshanlisuzuxiang", "tongzilinzhen", "yongxingzhen", "yumenzhen", "honggezhen", "hongguoyizuxiang"}; - List<Integer> ids = userDao.selectIdsByAccount(streetList); +// List<Integer> ids = userDao.selectIdsByAccount(streetList); //村或社区账号 Integer type = isVilliage(name); //是否为市级账号 -- Gitblit v1.7.1