From 19581d153ae26cbe2bf7c3a6d426d3c6f459ae5a Mon Sep 17 00:00:00 2001 From: fxh <1763817137@qq.com> Date: Fri, 4 Jul 2025 14:53:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...6fa672edd9334c0422_商品信息数据.xlsx | Bin 0 -> 4836 bytes ...5ba618b7c04d5afc9f_商品信息数据.xlsx | Bin 0 -> 4836 bytes qrcode/12342424.png | Bin 444 -> 0 bytes qrcode/1930206182499577858.png | Bin 419 -> 0 bytes qrcode/1931192482732077058.png | Bin 424 -> 0 bytes qrcode/1933713270742081537.png | Bin 435 -> 0 bytes qrcode/1935226754499760129.png | Bin 410 -> 0 bytes .../web/controller/IndexController.java | 4 +- .../web/service/impl/IndexServiceImpl.java | 118 ++++++++--------- .../src/main/resources/application-prod.yml | 6 +- .../src/main/resources/application.yml | 5 + .../goods/controller/BrandController.java | 22 ++-- .../controller/ProductCategoryController.java | 18 +-- .../goods/controller/ProductController.java | 39 +++--- .../goods/controller/SkuController.java | 26 ++-- .../soopin/goods/convert/BrandConvert.java | 2 - .../goods/convert/ProductCategoryConvert.java | 4 - .../soopin/goods/convert/ProductConvert.java | 8 -- .../wzj/soopin/goods/convert/SkuConvert.java | 2 - .../wzj/soopin/goods/domain/bo/ProductBo.java | 2 - .../goods/domain/bo/ProductCategoryBo.java | 6 +- .../com/wzj/soopin/goods/domain/bo/SkuBo.java | 1 - .../soopin/goods/domain/entity/Product.java | 2 +- .../wzj/soopin/goods/domain/entity/Sku.java | 2 + .../wzj/soopin/goods/domain/vo/ProductVO.java | 2 +- .../soopin/goods/mapper/ProductMapper.java | 12 +- .../soopin/goods/service/ProductService.java | 2 + .../goods/service/impl/BrandServiceImpl.java | 8 -- .../impl/ProductCategoryServiceImpl.java | 22 ---- .../service/impl/ProductServiceImpl.java | 44 ++----- .../goods/service/impl/SkuServiceImpl.java | 13 +- .../resources/mapper/goods/ProductMapper.xml | 2 +- .../main/resources/mapper/goods/SkuMapper.xml | 1 + ruoyi-modules/ruoyi-order/pom.xml | 4 + .../order/controller/AftersaleController.java | 15 +-- .../controller/AftersaleItemController.java | 34 ++--- .../order/controller/OrderController.java | 36 +++--- .../OrderDeliveryHistoryController.java | 31 ++--- .../order/controller/OrderItemController.java | 40 ++---- .../OrderOperateHistoryController.java | 28 ++-- .../VerificationCodeController.java | 23 +++- .../WechatPaymentHistoryController.java | 31 ++--- .../wzj/soopin/order/domain/entity/Order.java | 2 +- .../wzj/soopin/order/domain/vo/OrderVO.java | 2 +- .../order/mapper/AftersaleItemMapper.java | 5 +- .../soopin/order/mapper/AftersaleMapper.java | 2 - .../mapper/OrderDeliveryHistoryMapper.java | 9 -- .../soopin/order/mapper/OrderItemMapper.java | 14 ++ .../wzj/soopin/order/mapper/OrderMapper.java | 2 - .../mapper/OrderOperateHistoryMapper.java | 5 - .../order/mapper/VerificationCodesMapper.java | 9 +- .../mapper/WechatPaymentHistoryMapper.java | 4 - .../order/service/OrderItemService.java | 2 + .../soopin/order/service/OrderService.java | 3 - .../service/VerificationCodeService.java | 4 + .../impl/AftersaleItemServiceImpl.java | 10 -- .../service/impl/AftersaleServiceImpl.java | 41 ++---- .../impl/OrderDeliveryHistoryServiceImpl.java | 11 -- .../service/impl/OrderItemServiceImpl.java | 14 -- .../impl/OrderOperateHistoryServiceImpl.java | 14 +- .../order/service/impl/OrderServiceImpl.java | 70 +++++----- .../impl/VerificationCodeServiceImpl.java | 122 +++++++++++++----- .../impl/VerificationLogsServiceImpl.java | 3 + .../impl/WechatPaymentHistoryServiceImpl.java | 11 -- .../mapper/VerificationCodeMapper.xml | 33 +++++ .../controller/SysVersionController.java | 57 ++++++++ .../org/dromara/system/domain/SysVersion.java | 37 ++++++ .../system/domain/bo/SysVersionBo.java | 17 +++ .../system/domain/vo/SysVersionVo.java | 36 ++++++ .../system/mapper/SysVerisonMapper.java | 16 +++ .../system/service/ISysVerisonService.java | 15 +++ .../service/impl/SysVerisonServiceImpl.java | 37 ++++++ .../mapper/system/SysVersionMapper.xml | 26 ++++ 73 files changed, 684 insertions(+), 564 deletions(-) create mode 100644 null/download/1094464973f74e6fa672edd9334c0422_商品信息数据.xlsx create mode 100644 null/download/6ec52049deea405ba618b7c04d5afc9f_商品信息数据.xlsx delete mode 100644 qrcode/12342424.png delete mode 100644 qrcode/1930206182499577858.png delete mode 100644 qrcode/1931192482732077058.png delete mode 100644 qrcode/1933713270742081537.png delete mode 100644 qrcode/1935226754499760129.png create mode 100644 ruoyi-modules/ruoyi-order/src/main/resources/mapper/VerificationCodeMapper.xml create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysVersionController.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysVersion.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysVersionBo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysVersionVo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysVerisonMapper.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysVerisonService.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysVerisonServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysVersionMapper.xml diff --git a/null/download/1094464973f74e6fa672edd9334c0422_商品信息数据.xlsx b/null/download/1094464973f74e6fa672edd9334c0422_商品信息数据.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..db624c78ba301668704e40c25fb6fe72417f444f GIT binary patch literal 4836 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 Ef>)5Y&Hw-a diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java index 311f4cecd..b794ecce5 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java @@ -23,8 +23,8 @@ import java.util.Map; @RestController public class IndexController { - @Autowired - private IndexService indexService; + + private final IndexService indexService; /** * 访问首页，提示语 diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/IndexServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/IndexServiceImpl.java index f1a8de4af..f9b8a4c3f 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/IndexServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/IndexServiceImpl.java @@ -9,17 +9,20 @@ import com.wzj.soopin.member.service.IMemberAccountService; import com.wzj.soopin.order.mapper.OrderMapper; import com.wzj.soopin.transaction.domain.po.Withdraw; import com.wzj.soopin.transaction.service.IWithdrawService; +import lombok.RequiredArgsConstructor; import org.dromara.system.mapper.SysIntegralHistoryMapper; import org.dromara.system.mapper.SysTenantMapper; import org.dromara.system.mapper.SystemStatisticsMapper; import org.dromara.web.service.IndexService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.List; import java.util.Map; +/** + * @author fxh + */ @Service +@RequiredArgsConstructor public class IndexServiceImpl implements IndexService { @@ -33,71 +36,68 @@ public class IndexServiceImpl implements IndexService { private final ProductMapper productMapper; private final OrderMapper orderMapper; - public IndexServiceImpl(SysTenantMapper sysTenantMapper, VlogMapper vlogMapper, IMemberAccountService memberService, IFeedbackService feedbackService, IWithdrawService withdrawService, SystemStatisticsMapper systemStatisticsMapper, SysIntegralHistoryMapper sysIntegralHistoryMapper, ProductMapper productMapper, OrderMapper orderMapper) { - this.sysTenantMapper = sysTenantMapper; - this.vlogMapper = vlogMapper; - this.memberService = memberService; - this.feedbackService = feedbackService; - this.withdrawService = withdrawService; - this.systemStatisticsMapper = systemStatisticsMapper; - this.sysIntegralHistoryMapper = sysIntegralHistoryMapper; - this.productMapper = productMapper; - this.orderMapper = orderMapper; - } - @Override public Map getCount() { - Map result = new HashMap<>(); - //用户数量 - result.put("memberCount", memberService.count()); - //待审核视频 - result.put("vlogCount", vlogMapper.countVlog()); + Map result = new HashMap<>(16); - // 待审核举报统计 - QueryWrapper FeedbackWrapper = new QueryWrapper<>(); - FeedbackWrapper.eq("status", 0); - result.put("feedbackCount", feedbackService.count(FeedbackWrapper)); - // 待审核提现统计 - QueryWrapper withdrawQueryWrapper = new QueryWrapper<>(); - withdrawQueryWrapper.eq("audit_status", 0); - result.put("WithdrawCount", withdrawService.count(withdrawQueryWrapper)); + //（用户、视频、举报、提现） + addBasicStatistics(result); - // 商品统计、待审核商品统计 - Map productCounts = productMapper.countProduct(); - result.put("productCount", productCounts.get("count1")); - result.put("productAudit", productCounts.get("count2")); + //（商品、店铺、订单） + addCompositeStatistics(result); - // 店铺统计、待审核店铺统计 - Map StoreCounts = sysTenantMapper.countProduct(); - result.put("storeCount", StoreCounts.get("count1")); - result.put("StoreAudit", StoreCounts.get("count2")); + // Top20排行榜 + addTop20Statistics(result); - // 订单统计、待审核退款统计 - Map OrderCounts = orderMapper.countOrder(); - result.put("orderCount", OrderCounts.get("count1")); - result.put("orderAudit", OrderCounts.get("count2")); - - // 店铺TOP20 - List> top20Stores = sysTenantMapper.getTop20Stores(); - result.put("top20Stores", top20Stores); - - // 商品TOP20 - List> top20Product = productMapper.getTop20Product(); - result.put("top20Product", top20Product); - - // 分月用户量统计 - List> monthlyUserVolume = systemStatisticsMapper.getMonthlyUserVolume(); - result.put("monthlyUserVolume", monthlyUserVolume); - - // 分月短视频统计 - List> monthlyVlog = vlogMapper.getMonthlyVlog(); - result.put("monthlyVlog", monthlyVlog); - - // 分月收入支出统计 - List> monthlyIncomeExpense = sysIntegralHistoryMapper.getIncomeExpense(); - result.put("monthlyIncomeExpense", monthlyIncomeExpense); + // 月度趋势统计 + addMonthlyTrendStatistics(result); return result; } + private void addBasicStatistics(Map result) { + result.put("memberCount", memberService.count()); + result.put("vlogCount", vlogMapper.countVlog()); + + // 待审核举报 + result.put("feedbackCount", feedbackService.count( + new QueryWrapper().eq("status", 0) + )); + + // 待审核提现 + result.put("WithdrawCount", withdrawService.count( + new QueryWrapper().eq("audit_status", 0) + )); + } + + private void addCompositeStatistics(Map result) { + // 商品统计 + Map productCounts = productMapper.countProduct(); + result.put("productCount", productCounts.get("count2")); + result.put("productAudit", productCounts.get("count1")); + + // 店铺统计 + Map storeCounts = sysTenantMapper.countProduct(); + result.put("storeCount", storeCounts.get("count1")); + result.put("StoreAudit", storeCounts.get("count2")); + + // 订单统计 + Map orderCounts = orderMapper.countOrder(); + result.put("orderCount", orderCounts.get("count1")); + result.put("orderAudit", orderCounts.get("count2")); + } + + /** Top20排行榜 */ + private void addTop20Statistics(Map result) { + result.put("top20Stores", sysTenantMapper.getTop20Stores()); + result.put("top20Product", productMapper.getTop20Product()); + } + + /** 月度趋势统计 */ + private void addMonthlyTrendStatistics(Map result) { + result.put("monthlyUserVolume", systemStatisticsMapper.getMonthlyUserVolume()); + result.put("monthlyVlog", vlogMapper.getMonthlyVlog()); + result.put("monthlyIncomeExpense", sysIntegralHistoryMapper.getIncomeExpense()); + } + } diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index cf2ed27ae..2f5f780d9 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -52,9 +52,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: root + url: jdbc:mysql://82.156.121.2:23306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: wzj + password: A085F27A43B0 # # 从库数据源 # slave: # lazy: true diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 1bdd7783f..d95ebb913 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -176,6 +176,11 @@ tenant: - trans_divide_detail - trans_divide_rule - trans_divide_rule_detail + - aws_system_statistics + - act_integral_history + - sys_version + + # MyBatisPlus配置 # https://baomidou.com/config/ diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java index ef2c20937..374e2728e 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java @@ -1,24 +1,19 @@ package com.wzj.soopin.goods.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.goods.convert.BrandConvert; import com.wzj.soopin.goods.domain.bo.BrandBo; import com.wzj.soopin.goods.domain.entity.Brand; -import com.wzj.soopin.goods.domain.query.BrandQuery; import com.wzj.soopin.goods.domain.vo.BrandVO; import com.wzj.soopin.goods.service.impl.BrandServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -31,11 +26,11 @@ import java.util.List; @Tag(name ="品牌管理接口列表") @RestController @RequestMapping("/pms/brand") +@RequiredArgsConstructor public class BrandController extends BaseController { - @Autowired - private BrandServiceImpl service; - @Autowired - private BrandConvert convert; + + private final BrandServiceImpl service; + private final BrandConvert convert; @Tag(name ="所有品牌管理列表") @@ -47,13 +42,14 @@ public class BrandController extends BaseController { @Tag(name ="导出品牌管理列表") @Log(title = "品牌管理", businessType = BusinessType.EXPORT) - @GetMapping("export") - public ResponseEntity export(BrandBo query) { + @PostMapping("export") + public R export(BrandBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(BrandVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "品牌管理数据")); + return R.ok(util.writeExcel(convert.toVO(list), "品牌管理数据")); } + @Tag(name ="获取品牌管理详细信息") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") Long id) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java index 52ec17204..75b44fcac 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java @@ -2,26 +2,18 @@ package com.wzj.soopin.goods.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.goods.convert.ProductCategoryConvert; -import com.wzj.soopin.goods.domain.bo.BrandBo; import com.wzj.soopin.goods.domain.bo.ProductCategoryBo; -import com.wzj.soopin.goods.domain.entity.Brand; import com.wzj.soopin.goods.domain.entity.ProductCategory; -import com.wzj.soopin.goods.domain.query.ProductCategoryQuery; -import com.wzj.soopin.goods.domain.vo.BrandVO; import com.wzj.soopin.goods.domain.vo.ProductCategoryVO; import com.wzj.soopin.goods.service.impl.ProductCategoryServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.util.List; /** * 商品分类Controller @@ -32,11 +24,11 @@ import java.util.List; @Tag(name ="商品分类接口列表") @RestController @RequestMapping("/pms/productCategory") +@RequiredArgsConstructor public class ProductCategoryController extends BaseController { - @Autowired - private ProductCategoryServiceImpl service; - @Autowired - private ProductCategoryConvert convert; + + private final ProductCategoryServiceImpl service; + private final ProductCategoryConvert convert; @Tag(name ="查询商品分类列表") @PostMapping("list") diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java index 6ae65d4cd..fb497e1aa 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java @@ -4,28 +4,18 @@ package com.wzj.soopin.goods.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.goods.convert.ProductConvert; -import com.wzj.soopin.goods.domain.bo.BrandBo; import com.wzj.soopin.goods.domain.bo.ProductBo; -import com.wzj.soopin.goods.domain.bo.ProductCategoryBo; -import com.wzj.soopin.goods.domain.entity.Brand; import com.wzj.soopin.goods.domain.entity.Product; -import com.wzj.soopin.goods.domain.entity.ProductCategory; -import com.wzj.soopin.goods.domain.query.ProductQuery; -import com.wzj.soopin.goods.domain.vo.BrandVO; -import com.wzj.soopin.goods.domain.vo.ProductCategoryVO; import com.wzj.soopin.goods.domain.vo.ProductVO; import com.wzj.soopin.goods.service.ProductService; import com.wzj.soopin.goods.service.impl.ProductServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -37,14 +27,13 @@ import java.util.List; */ @Tag(name ="商品信息接口列表") @RestController - @RequestMapping("/pms/product") +@RequestMapping("/pms/product") +@RequiredArgsConstructor public class ProductController extends BaseController { - @Autowired - private ProductServiceImpl service; - @Autowired - private ProductConvert convert; - @Autowired - private ProductService productService; + + private final ProductServiceImpl service; + private final ProductConvert convert; + private final ProductService productService; @Tag(name ="查询商品信息列表") @PostMapping("list") @@ -55,14 +44,13 @@ public class ProductController extends BaseController { @Tag(name ="导出商品信息列表") @Log(title = "商品信息", businessType = BusinessType.EXPORT) - @GetMapping("export") - public ResponseEntity export(ProductBo query) { + @PostMapping("export") + public R export(ProductBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(ProductVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "商品信息数据")); + return R.ok(util.writeExcel(convert.toVO(list), "商品信息数据")); } - @Tag(name ="获取商品信息详细信息") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") Long id) { @@ -95,14 +83,17 @@ public class ProductController extends BaseController { @Tag(name ="审核商品") @Log(title = "审核商品", businessType = BusinessType.UPDATE) @GetMapping("/audit") - public R audit( @RequestParam Long id, @RequestParam Integer authFlag,@RequestParam(required = false) String reasons) { + public R audit( @RequestParam Long id, + @RequestParam Integer authFlag, + @RequestParam(required = false) String reasons) { return R.ok(service.audit(id,authFlag,reasons)); } @Tag(name ="上下架商品") @Log(title = "上下架商品", businessType = BusinessType.UPDATE) @GetMapping("/publish") - public R publish( @RequestParam Long id, @RequestParam Integer publishStatus) { + public R publish( @RequestParam Long id, + @RequestParam Integer publishStatus) { return R.ok(service.publish(id,publishStatus)); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java index 910b5c766..44c88d6cc 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java @@ -3,24 +3,17 @@ package com.wzj.soopin.goods.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.goods.convert.SkuConvert; -import com.wzj.soopin.goods.domain.bo.ProductBo; import com.wzj.soopin.goods.domain.bo.SkuBo; -import com.wzj.soopin.goods.domain.entity.Product; import com.wzj.soopin.goods.domain.entity.Sku; -import com.wzj.soopin.goods.domain.query.SkuQuery; -import com.wzj.soopin.goods.domain.vo.ProductVO; import com.wzj.soopin.goods.domain.vo.SkuVO; import com.wzj.soopin.goods.service.impl.SkuServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -28,16 +21,16 @@ import java.util.List; * sku信息Controller * * @author zcc - * @date 2022-11-28 + * @date 2022-11-28 */ @Tag(name ="sku信息接口列表") @RestController @RequestMapping("/pms/sku") +@RequiredArgsConstructor public class SkuController extends BaseController { - @Autowired - private SkuServiceImpl service; - @Autowired - private SkuConvert convert; + + private final SkuServiceImpl service; + private final SkuConvert convert; @Tag(name ="查询商品信息列表") @PostMapping("list") @@ -45,14 +38,13 @@ public class SkuController extends BaseController { return R.ok(service.getList(query,page)); } - @Tag(name ="导出sku信息列表") @Log(title = "sku信息", businessType = BusinessType.EXPORT) - @GetMapping("export") - public ResponseEntity export(SkuBo query) { + @PostMapping("export") + public R export(SkuBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(SkuVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "sku信息数据")); + return R.ok(util.writeExcel(convert.toVO(list), "sku信息数据")); } @Tag(name ="获取sku信息详细信息") diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/BrandConvert.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/BrandConvert.java index a690bd6d1..93ef897c3 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/BrandConvert.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/BrandConvert.java @@ -6,7 +6,6 @@ import com.wzj.soopin.goods.domain.vo.BrandVO; import org.dromara.common.web.core.BaseConverter; import org.mapstruct.Mapper; -import java.util.List; /** * 品牌管理 DO <=> DTO <=> VO / BO / Query * @@ -15,5 +14,4 @@ import java.util.List; @Mapper(componentModel = "spring") public interface BrandConvert extends BaseConverter { -// List dos2vos(List list); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/ProductCategoryConvert.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/ProductCategoryConvert.java index 12ee36da8..8cb576995 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/ProductCategoryConvert.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/ProductCategoryConvert.java @@ -1,7 +1,6 @@ package com.wzj.soopin.goods.convert; import com.wzj.soopin.goods.domain.bo.ProductCategoryBo; -import com.wzj.soopin.goods.domain.dto.CategoryDTO; import com.wzj.soopin.goods.domain.entity.ProductCategory; import com.wzj.soopin.goods.domain.vo.ProductCategoryVO; import org.dromara.common.web.core.BaseConverter; @@ -16,7 +15,4 @@ import java.util.List; @Mapper(componentModel = "spring") public interface ProductCategoryConvert extends BaseConverter { -// List dos2vos(List list); -// -// CategoryDTO do2dto(ProductCategory it); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/ProductConvert.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/ProductConvert.java index 838c2ab95..6b6de0195 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/ProductConvert.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/ProductConvert.java @@ -3,13 +3,10 @@ package com.wzj.soopin.goods.convert; import com.wzj.soopin.goods.domain.bo.ProductBo; import com.wzj.soopin.goods.domain.entity.Product; -import com.wzj.soopin.goods.domain.vo.H5ProductVO; import com.wzj.soopin.goods.domain.vo.ProductVO; -import org.apache.poi.ss.formula.functions.T; import org.dromara.common.web.core.BaseConverter; import org.mapstruct.Mapper; -import java.util.List; /** * 商品信息 DO <=> DTO <=> VO / BO / Query * @@ -18,9 +15,4 @@ import java.util.List; @Mapper(componentModel = "spring") public interface ProductConvert extends BaseConverter { -// List dos2vos(List list); -// Product vo2do(ProductVO productVO); -// ProductVO do2vo(Product product); -// -// List dos2dtos(List products); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/SkuConvert.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/SkuConvert.java index dc06a01bf..dfaf5ce49 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/SkuConvert.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/convert/SkuConvert.java @@ -6,7 +6,6 @@ import com.wzj.soopin.goods.domain.vo.SkuVO; import org.dromara.common.web.core.BaseConverter; import org.mapstruct.Mapper; -import java.util.List; /** * sku信息 DO <=> DTO <=> VO / BO / Query * @@ -15,5 +14,4 @@ import java.util.List; @Mapper(componentModel = "spring") public interface SkuConvert extends BaseConverter { -// List dos2vos(List list); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java index 49ea55329..31c43f6d6 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java @@ -2,7 +2,6 @@ package com.wzj.soopin.goods.domain.bo; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.wzj.soopin.goods.domain.entity.Product; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -71,7 +70,6 @@ public class ProductBo { @Schema(description = "搜索关键字") private String search; - // 排查的id @Schema(description = "排除的商品ID列表") private List excludeProductIds; diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java index d6f0c7890..7af905a9d 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java @@ -6,9 +6,9 @@ import com.wzj.soopin.goods.domain.entity.ProductCategory; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.math.BigDecimal; -import java.util.List; - +/** + * @author fxh + */ @Data @Schema(description = "商品分类 查询 对象") public class ProductCategoryBo { diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/SkuBo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/SkuBo.java index a6e86952c..62e8ee144 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/SkuBo.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/SkuBo.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.wzj.soopin.goods.domain.entity.Sku; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.dromara.common.excel.annotation.Excel; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Product.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Product.java index ebb041c61..ee0e4d9f3 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Product.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Product.java @@ -92,7 +92,7 @@ public class Product extends BaseAudit { @Schema(description = "店铺id") @Excel(name = "店铺id") - private String tenantId; + private Long tenantId; @Schema(description = "审核状态 1.待审核;->2.审核通过;3->审核驳回") @Excel(name = "审核状态 1.待审核;->2.审核通过;3->审核驳回") diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Sku.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Sku.java index e3138b78a..098f54679 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Sku.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Sku.java @@ -3,6 +3,7 @@ package com.wzj.soopin.goods.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.excel.annotation.Excel; @@ -13,6 +14,7 @@ import java.math.BigDecimal; * * @author zcc */ +@EqualsAndHashCode(callSuper = true) @Schema(description = "SKU信息对象") @Data @TableName("pms_sku") diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java index 19b4eb05a..47051b0ed 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/vo/ProductVO.java @@ -113,7 +113,7 @@ public class ProductVO extends BaseAudit { private String contactPhone; @Schema(description = "店铺id") - private String tenantId; + private Long tenantId; @Schema(description = "审核状态 1.待审核、2.审核通过、3.审核驳回") private String authFlag; diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java index bcb89b6de..77c0c7b7e 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/mapper/ProductMapper.java @@ -32,12 +32,6 @@ public interface ProductMapper extends BaseMapper { - @Select("SELECT " + - "SUM(CASE WHEN auth_flag = 1 THEN 1 ELSE 0 END) AS count1, " + - "SUM(CASE WHEN auth_flag = 2 THEN 1 ELSE 0 END) AS count2 " + - "FROM pms_product") - Map countProduct(); - @Select("SELECT " + "name, " + "sales, " + @@ -50,4 +44,10 @@ public interface ProductMapper extends BaseMapper { ProductVO selectProductWithSkus(@Param("id") Long id); + + @Select("SELECT " + + "SUM(CASE WHEN auth_flag = 1 THEN 1 ELSE 0 END) AS count1, " + + "SUM(CASE WHEN auth_flag = 2 THEN 1 ELSE 0 END) AS count2 " + + "FROM pms_product") + Map countProduct(); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java index ddeaca72e..1c8d4e0bf 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/ProductService.java @@ -8,5 +8,7 @@ import com.wzj.soopin.goods.domain.entity.Product; import com.wzj.soopin.goods.domain.vo.ProductVO; public interface ProductService extends IService { + IPage getList(ProductBo query, Page page); + } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/BrandServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/BrandServiceImpl.java index 78f16d7f6..c5e7184fa 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/BrandServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/BrandServiceImpl.java @@ -1,20 +1,12 @@ package com.wzj.soopin.goods.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wzj.soopin.goods.domain.entity.Brand; -import com.wzj.soopin.goods.domain.query.BrandQuery; import com.wzj.soopin.goods.mapper.BrandMapper; import com.wzj.soopin.goods.service.BrandService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.util.List; - /** * 品牌管理Service业务层处理 * diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductCategoryServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductCategoryServiceImpl.java index 1b9012818..6a744149c 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductCategoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductCategoryServiceImpl.java @@ -1,33 +1,11 @@ package com.wzj.soopin.goods.service.impl; -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.goods.convert.ProductCategoryConvert; -import com.wzj.soopin.goods.convert.ProductConvert; -import com.wzj.soopin.goods.domain.dto.CategoryDTO; -import com.wzj.soopin.goods.domain.entity.Product; import com.wzj.soopin.goods.domain.entity.ProductCategory; -import com.wzj.soopin.goods.domain.query.ProductCategoryQuery; -import com.wzj.soopin.goods.domain.vo.ProductCategoryVO; import com.wzj.soopin.goods.mapper.ProductCategoryMapper; -import com.wzj.soopin.goods.mapper.ProductMapper; import com.wzj.soopin.goods.service.ProductCategoryService; -import com.wzj.soopin.goods.service.ProductService; -import org.apache.commons.lang3.StringUtils; -import org.dromara.common.core.exception.base.BaseException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; /** * 商品分类Service业务层处理 diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java index d98dc880b..049e6156e 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java @@ -1,35 +1,15 @@ package com.wzj.soopin.goods.service.impl; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -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.wzj.soopin.goods.convert.ProductConvert; import com.wzj.soopin.goods.domain.bo.ProductBo; import com.wzj.soopin.goods.domain.entity.Product; -import com.wzj.soopin.goods.domain.entity.Sku; -import com.wzj.soopin.goods.domain.query.ProductQuery; -import com.wzj.soopin.goods.domain.vo.ProductDetailVO; import com.wzj.soopin.goods.domain.vo.ProductVO; -import com.wzj.soopin.goods.mapper.BrandMapper; import com.wzj.soopin.goods.mapper.ProductMapper; -import com.wzj.soopin.goods.mapper.SkuMapper; import com.wzj.soopin.goods.service.ProductService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * 商品信息Service业务层处理 @@ -38,19 +18,21 @@ import java.util.stream.Collectors; * @author zcc */ @Service -@Slf4j +@RequiredArgsConstructor public class ProductServiceImpl extends ServiceImpl implements ProductService { - @Autowired - private ProductMapper productMapper; + + + private final ProductMapper productMapper; @Override public IPage getList(ProductBo query, Page page) { - IPage resultPage = productMapper.getlist(page,query); - return resultPage; + return productMapper.getlist(page,query); } public Product audit(Long id, Integer authFlag,String reasons) { - Product productToUpdate = new Product(); - productToUpdate.setId(id); + Product productToUpdate = productMapper.selectById(id); + if (productToUpdate == null) { + throw new RuntimeException("商品不存在"); + } productToUpdate.setAuthFlag(authFlag); productToUpdate.setReasons(reasons); productMapper.updateById(productToUpdate); @@ -58,8 +40,10 @@ public class ProductServiceImpl extends ServiceImpl impl } public Product publish(Long id, Integer publishStatus) { - Product product = new Product(); - product.setId(id); + Product product = productMapper.selectById(id); + if (product == null) { + throw new RuntimeException("商品不存在"); + } product.setPublishStatus(publishStatus); productMapper.updateById(product); return product; diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/SkuServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/SkuServiceImpl.java index 9a10792db..34a37e8a1 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/SkuServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/SkuServiceImpl.java @@ -1,6 +1,5 @@ package com.wzj.soopin.goods.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; @@ -9,12 +8,9 @@ import com.wzj.soopin.goods.domain.entity.Sku; import com.wzj.soopin.goods.domain.vo.SkuVO; import com.wzj.soopin.goods.mapper.SkuMapper; import com.wzj.soopin.goods.service.SkuService; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; /** * sku信息Service业务层处理 @@ -23,12 +19,13 @@ import java.util.List; * @author zcc */ @Service +@RequiredArgsConstructor public class SkuServiceImpl extends ServiceImpl implements SkuService { - @Autowired private SkuMapper skuMapper; + + private final SkuMapper skuMapper; public IPage getList(SkuBo query, Page page) { - IPage resultPage = skuMapper.getlist(page,query); - return resultPage; + return skuMapper.getlist(page,query); } public SkuVO selectSkuByid(Long id) { diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml index 8a7e7bbf5..3c1d8c6a0 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml +++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT p.*, b.name AS brandName, diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml index 83e08a009..5078df8a0 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml +++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/SkuMapper.xml @@ -2,6 +2,7 @@ + diff --git a/ruoyi-modules/ruoyi-order/pom.xml b/ruoyi-modules/ruoyi-order/pom.xml index 8a3035b2d..a472d960c 100644 --- a/ruoyi-modules/ruoyi-order/pom.xml +++ b/ruoyi-modules/ruoyi-order/pom.xml @@ -162,6 +162,10 @@ org.dromara ruoyi-content + + org.dromara + ruoyi-im + diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java index a329d2086..5a2f247df 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java @@ -10,6 +10,7 @@ import com.wzj.soopin.order.domain.form.DealWithAftersaleForm; import com.wzj.soopin.order.domain.vo.*; import com.wzj.soopin.order.service.impl.AftersaleServiceImpl; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.model.LoginUser; @@ -19,7 +20,6 @@ import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.redis.redis.RedisService; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -35,18 +35,13 @@ import java.util.List; @RestController @RequestMapping("/oms/aftersale") @Slf4j +@RequiredArgsConstructor public class AftersaleController extends BaseController { private final AftersaleServiceImpl service; private final AftersaleConvert convert; private final RedisService redisService; - public AftersaleController(AftersaleServiceImpl service, AftersaleConvert convert, RedisService redisService) { - this.service = service; - this.convert = convert; - this.redisService = redisService; - } - @Tag(name ="查询订单售后列表") @PostMapping("/list") @@ -57,11 +52,11 @@ public class AftersaleController extends BaseController { @Tag(name ="导出订单售后列表") @Log(title = "订单售后", businessType = BusinessType.EXPORT) - @GetMapping("export") - public ResponseEntity export(AftersaleBo query) { + @PostMapping("export") + public R export(AftersaleBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(AftersaleVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单售后数据")); + return R.ok(util.writeExcel(convert.toVO(list), "订单售后数据")); } @Tag(name ="获取订单售后详细信息") diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java index 3a30ac135..7bf917a98 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java @@ -1,33 +1,20 @@ package com.wzj.soopin.order.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.wzj.soopin.member.domain.bo.MemberAccountBO; -import com.wzj.soopin.member.domain.po.Member; -import com.wzj.soopin.member.domain.po.MemberAccount; -import com.wzj.soopin.member.domain.vo.MemberAccountVO; import com.wzj.soopin.order.convert.AftersaleItemConvert; -import com.wzj.soopin.order.domain.bo.AftersaleBo; import com.wzj.soopin.order.domain.bo.AftersaleItemBo; -import com.wzj.soopin.order.domain.entity.Aftersale; import com.wzj.soopin.order.domain.entity.AftersaleItem; -import com.wzj.soopin.order.domain.form.ManagerAftersaleOrderForm; -import com.wzj.soopin.order.domain.query.AftersaleItemQuery; import com.wzj.soopin.order.domain.vo.AftersaleItemVO; -import com.wzj.soopin.order.domain.vo.AftersaleVO; -import com.wzj.soopin.order.domain.vo.PageVO; import com.wzj.soopin.order.service.AftersaleItemService; import com.wzj.soopin.order.service.impl.AftersaleItemServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -41,13 +28,12 @@ import java.util.List; @Tag(name ="订单售后接口列表") @RestController @RequestMapping("/oms/aftersaleItem") +@RequiredArgsConstructor public class AftersaleItemController extends BaseController { - @Autowired - private AftersaleItemServiceImpl service; - @Autowired - private AftersaleItemConvert convert; - @Autowired - private AftersaleItemService aftersaleItemService; + + private final AftersaleItemServiceImpl service; + private final AftersaleItemConvert convert; + private final AftersaleItemService aftersaleItemService; @Tag(name ="查询订单售后列表") @PostMapping("/list") @@ -56,15 +42,13 @@ public class AftersaleItemController extends BaseController { return R.ok(convert.toVO(list)); } - - @Tag(name ="导出订单售后列表") @Log(title = "订单售后", businessType = BusinessType.EXPORT) - @GetMapping("export") - public ResponseEntity export(AftersaleItemBo query) { + @PostMapping("export") + public R export(AftersaleItemBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(AftersaleItemVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单售后数据")); + return R.ok(util.writeExcel(convert.toVO(list), "订单售后数据")); } @Tag(name ="获取订单售后详细信息") diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java index 4491ebbee..c5ab63806 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java @@ -10,6 +10,7 @@ import com.wzj.soopin.order.domain.vo.*; import com.wzj.soopin.order.service.OrderService; import com.wzj.soopin.order.service.impl.OrderServiceImpl; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.SecurityUtils; @@ -18,7 +19,6 @@ import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.redis.redis.RedisService; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -28,21 +28,19 @@ import java.util.List; * 订单表Controller * * @author zcc - * @date 2022-12-01 + * @date 2022-12-01 */ @Tag(name ="订单表接口列表") @RestController @RequestMapping("/oms/order") @Slf4j +@RequiredArgsConstructor public class OrderController extends BaseController { - @Autowired - private OrderServiceImpl service; - @Autowired - private OrderConvert convert; - @Autowired - private RedisService redisService; - @Autowired - private OrderService orderService; + + private final OrderServiceImpl service; + private final OrderConvert convert; + private final RedisService redisService; + private final OrderService orderService; @Tag(name ="查询订单列表") @@ -60,13 +58,12 @@ public class OrderController extends BaseController { @Tag(name ="导出订单表列表") @Log(title = "订单售后", businessType = BusinessType.EXPORT) @PostMapping("export") - public ResponseEntity export(OrderBo query) { + public R export(OrderBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(OrderVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单售后数据")); + return R.ok(util.writeExcel(convert.toVO(list), "订单列表数据")); } - @Tag(name ="获取订单表详细信息") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") Long id) { @@ -77,7 +74,16 @@ public class OrderController extends BaseController { @Log(title = "订单表", businessType = BusinessType.INSERT) @PostMapping("/add") public R add(@RequestBody Order order) { - return service.insert(order); + R result = service.insert(order); + + if (result != null) { + // 订单创建成功，发送消息 + service.sendMessage(order); + log.info("订单创建成功，消息已发送，订单ID: {}", order.getId()); + } else { + log.warn("订单创建失败: {}", "返回结果为null"); + } + return result; } @Tag(name ="修改订单表") @@ -97,7 +103,7 @@ public class OrderController extends BaseController { @Tag(name ="添加备注") @Log(title = "订单表", businessType = BusinessType.UPDATE) @PostMapping("/merchantNote/add") - public R saveMerchantNote(@RequestBody Order order){ + public R saveMerchantNote(@RequestBody Order order){ return service.saveMerchantNote(order); } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java index 78d380264..59e6eee5f 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java @@ -3,29 +3,18 @@ package com.wzj.soopin.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.order.convert.OrderDeliveryHistoryConvert; -import com.wzj.soopin.order.domain.bo.OrderBo; import com.wzj.soopin.order.domain.bo.OrderDeliveryHistoryBo; -import com.wzj.soopin.order.domain.entity.Order; import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory; -import com.wzj.soopin.order.domain.form.DeliverProductForm; -import com.wzj.soopin.order.domain.form.ManagerOrderQueryForm; -import com.wzj.soopin.order.domain.query.OrderDeliveryHistoryQuery; -import com.wzj.soopin.order.domain.vo.ManagerOrderVO; import com.wzj.soopin.order.domain.vo.OrderDeliveryHistoryVO; -import com.wzj.soopin.order.domain.vo.OrderVO; -import com.wzj.soopin.order.domain.vo.PageVO; import com.wzj.soopin.order.service.OrderDeliveryHistoryService; import com.wzj.soopin.order.service.impl.OrderDeliveryHistoryServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -38,13 +27,12 @@ import java.util.List; @Tag(name ="订单发货记录接口列表") @RestController @RequestMapping("/oms/orderDeliveryHistory") +@RequiredArgsConstructor public class OrderDeliveryHistoryController extends BaseController { - @Autowired - private OrderDeliveryHistoryServiceImpl service; - @Autowired - private OrderDeliveryHistoryConvert convert; - @Autowired - private OrderDeliveryHistoryService historyService; + + private final OrderDeliveryHistoryServiceImpl service; + private final OrderDeliveryHistoryConvert convert; + private final OrderDeliveryHistoryService historyService; @Tag(name ="查询订单发货列表") @PostMapping("/list") @@ -53,14 +41,13 @@ public class OrderDeliveryHistoryController extends BaseController { return R.ok(convert.toVO(list)); } - @Tag(name ="导出订单发货记录列表") @Log(title = "订单发货记录", businessType = BusinessType.EXPORT) - @GetMapping("export") - public ResponseEntity export(OrderDeliveryHistoryBo query) { + @PostMapping("export") + public R export(OrderDeliveryHistoryBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(OrderDeliveryHistoryVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单发货记录数据")); + return R.ok(util.writeExcel(convert.toVO(list), "订单发货记录数据")); } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java index 86129977c..8b63b56e6 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java @@ -1,37 +1,20 @@ package com.wzj.soopin.order.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.wzj.soopin.member.domain.bo.MemberBO; -import com.wzj.soopin.member.domain.po.Member; -import com.wzj.soopin.member.domain.vo.MemberVO; import com.wzj.soopin.order.convert.OrderItemConvert; -import com.wzj.soopin.order.domain.bo.AftersaleBo; -import com.wzj.soopin.order.domain.bo.AftersaleItemBo; -import com.wzj.soopin.order.domain.bo.OrderDeliveryHistoryBo; import com.wzj.soopin.order.domain.bo.OrderItemBo; -import com.wzj.soopin.order.domain.entity.AftersaleItem; -import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory; import com.wzj.soopin.order.domain.entity.OrderItem; -import com.wzj.soopin.order.domain.query.OrderDeliveryHistoryQuery; -import com.wzj.soopin.order.domain.query.OrderItemQuery; -import com.wzj.soopin.order.domain.vo.AftersaleItemVO; -import com.wzj.soopin.order.domain.vo.OrderDeliveryHistoryVO; import com.wzj.soopin.order.domain.vo.OrderItemVO; -import com.wzj.soopin.order.domain.vo.PageVO; import com.wzj.soopin.order.service.OrderItemService; import com.wzj.soopin.order.service.impl.OrderItemServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -44,13 +27,13 @@ import java.util.List; @Tag(name ="订单中所包含的商品接口列表") @RestController @RequestMapping("/oms/orderItem") +@RequiredArgsConstructor public class OrderItemController extends BaseController { - @Autowired - private OrderItemServiceImpl service; - @Autowired - private OrderItemConvert convert; - @Autowired - private OrderItemService orderItemService; + + + private final OrderItemServiceImpl service; + private final OrderItemConvert convert; + private final OrderItemService orderItemService; @Tag(name = "查询订单中所包含的商品列表") @PostMapping("/list") @@ -59,14 +42,13 @@ public class OrderItemController extends BaseController { return R.ok(convert.toVO(list)); } - - @Tag(name = "导出会员信息列表") + @Tag(name ="导出会员信息列表") @Log(title = "会员信息", businessType = BusinessType.EXPORT) - @GetMapping("export") - public ResponseEntity export(OrderItemBo query) { + @PostMapping("export") + public R export(OrderItemBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(OrderItemVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单中所包含的商品数据")); + return R.ok(util.writeExcel(convert.toVO(list), "订单中所包含的商品数据")); } @Tag(name = "获取订单中所包含的商品详细信息") diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java index 1bc547761..cb432c088 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java @@ -1,30 +1,19 @@ package com.wzj.soopin.order.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.order.convert.OrderOperateHistoryConvert; -import com.wzj.soopin.order.domain.bo.OrderItemBo; import com.wzj.soopin.order.domain.bo.OrderOperateHistoryBo; -import com.wzj.soopin.order.domain.entity.OrderItem; import com.wzj.soopin.order.domain.entity.OrderOperateHistory; -import com.wzj.soopin.order.domain.query.OrderItemQuery; -import com.wzj.soopin.order.domain.query.OrderOperateHistoryQuery; -import com.wzj.soopin.order.domain.vo.OrderItemVO; import com.wzj.soopin.order.domain.vo.OrderOperateHistoryVO; -import com.wzj.soopin.order.domain.vo.PageVO; -import com.wzj.soopin.order.service.OrderOperateHistoryService; import com.wzj.soopin.order.service.impl.OrderOperateHistoryServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -37,11 +26,12 @@ import java.util.List; @Tag(name ="订单操作历史记录接口列表") @RestController @RequestMapping("/oms/orderOperateHistory") +@RequiredArgsConstructor public class OrderOperateHistoryController extends BaseController { - @Autowired - private OrderOperateHistoryServiceImpl service; - @Autowired - private OrderOperateHistoryConvert convert; + + + private final OrderOperateHistoryServiceImpl service; + private final OrderOperateHistoryConvert convert; @Tag(name ="查询订单操作历史记录列表") @PostMapping("/list") @@ -53,11 +43,11 @@ public class OrderOperateHistoryController extends BaseController { @Tag(name ="导出订单操作历史记录列表") @Log(title = "订单操作历史记录", businessType = BusinessType.EXPORT) - @GetMapping("export") - public ResponseEntity export(OrderOperateHistoryBo query) { + @PostMapping("export") + public R export(OrderOperateHistoryBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(OrderOperateHistoryVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "订单操作历史记录数据")); + return R.ok(util.writeExcel(convert.toVO(list), "订单操作历史记录数据")); } @Tag(name ="获取订单操作历史记录详细信息") diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/VerificationCodeController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/VerificationCodeController.java index e2f731da3..efb8d14cf 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/VerificationCodeController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/VerificationCodeController.java @@ -2,23 +2,25 @@ package com.wzj.soopin.order.controller; import com.wzj.soopin.order.domain.dto.CodeVerificationDto; import com.wzj.soopin.order.service.VerificationCodeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** * 核销码相关接口 + * @author fxh */ @Tag(name = "核销码接口") @RestController @RequestMapping("/oms/verification") +@RequiredArgsConstructor +@Slf4j public class VerificationCodeController { - @Autowired - private VerificationCodeService verificationCodeService; + + private final VerificationCodeService verificationCodeService; /** @@ -32,12 +34,19 @@ public class VerificationCodeController { /** * 扫码核销接口 - * @return 核销结果z + * @return 核销结果 */ @PostMapping("/verify") @Tag(name = "扫码核销接口") public R verifyCode(@RequestBody CodeVerificationDto codeVerificationDto) { - return verificationCodeService.verifyCode(codeVerificationDto); + R result = verificationCodeService.verifyCode(codeVerificationDto); + if (R.isSuccess(result)){ + verificationCodeService.sendMessage(codeVerificationDto); + } + else{ + verificationCodeService.sendMessageNo(codeVerificationDto); + } + return result; } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java index 2ae6ff1ec..641bd6bbd 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java @@ -3,27 +3,18 @@ package com.wzj.soopin.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.order.convert.WechatPaymentHistoryConvert; -import com.wzj.soopin.order.domain.bo.OrderOperateHistoryBo; import com.wzj.soopin.order.domain.bo.WechatPaymentHistoryBo; -import com.wzj.soopin.order.domain.entity.OrderOperateHistory; import com.wzj.soopin.order.domain.entity.WechatPaymentHistory; -import com.wzj.soopin.order.domain.query.OrderOperateHistoryQuery; -import com.wzj.soopin.order.domain.query.WechatPaymentHistoryQuery; -import com.wzj.soopin.order.domain.vo.OrderOperateHistoryVO; -import com.wzj.soopin.order.domain.vo.PageVO; import com.wzj.soopin.order.domain.vo.WechatPaymentHistoryVO; import com.wzj.soopin.order.service.WechatPaymentHistoryService; import com.wzj.soopin.order.service.impl.WechatPaymentHistoryServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -31,18 +22,17 @@ import java.util.List; * 微信订单表Controller * * @author zcc - * @date 2023-07-12 + * @date 2023-07-12 */ @Tag(name ="微信订单表接口列表") @RestController @RequestMapping("/pms/omsWechatPaymentHistory") +@RequiredArgsConstructor public class WechatPaymentHistoryController extends BaseController { - @Autowired - private WechatPaymentHistoryServiceImpl service; - @Autowired - private WechatPaymentHistoryConvert convert; - @Autowired - private WechatPaymentHistoryService wechatPaymentHistoryService; + + private final WechatPaymentHistoryServiceImpl service; + private final WechatPaymentHistoryConvert convert; + private final WechatPaymentHistoryService wechatPaymentHistoryService; @Tag(name ="查询微信订单表列表") @PostMapping("/list") public R> list(@RequestBody WechatPaymentHistoryBo query, Page page) { @@ -50,14 +40,13 @@ public class WechatPaymentHistoryController extends BaseController { return R.ok(convert.toVO(list)); } - @Tag(name ="导出微信订单表列表") @Log(title = "微信订单表", businessType = BusinessType.EXPORT) - @GetMapping("export") - public ResponseEntity export(WechatPaymentHistoryBo query) { + @PostMapping("export") + public R export(WechatPaymentHistoryBo query) { List list = service.list(query.toWrapper()); ExcelUtil util = new ExcelUtil<>(WechatPaymentHistoryVO.class); - return ResponseEntity.ok(util.writeExcel(convert.toVO(list), "微信订单表数据")); + return R.ok(util.writeExcel(convert.toVO(list), "微信订单表数据")); } @Tag(name ="获取微信订单表详细信息") diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java index 2a7beb136..2ee750837 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java @@ -34,7 +34,7 @@ public class Order extends BaseAudit { private Long payId; @Schema(description = "租户id") - private String tenantId; + private Long tenantId; @Schema(description = "订单编号") @Excel(name = "订单编号") diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java index 3bf3f52b3..5c4109b97 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java @@ -37,7 +37,7 @@ public class OrderVO extends BaseAudit { private Long memberId; @Schema(description ="租户id") - private String tenantId; + private Long tenantId; @Schema(description ="用户帐号") @Excel(name = "用户帐号") diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/AftersaleItemMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/AftersaleItemMapper.java index 6940e106b..535db22a0 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/AftersaleItemMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/AftersaleItemMapper.java @@ -1,12 +1,9 @@ package com.wzj.soopin.order.mapper; -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.wzj.soopin.order.domain.entity.AftersaleItem; -import com.wzj.soopin.order.domain.query.AftersaleItemQuery; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; + import java.util.List; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/AftersaleMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/AftersaleMapper.java index 8236dec3c..164216cb4 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/AftersaleMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/AftersaleMapper.java @@ -8,8 +8,6 @@ import com.wzj.soopin.order.domain.entity.Aftersale; import com.wzj.soopin.order.domain.form.ManagerAftersaleOrderForm; import com.wzj.soopin.order.domain.vo.AftersaleVO; import com.wzj.soopin.order.domain.vo.ManagerRefundOrderVO; -import com.wzj.soopin.order.domain.vo.OrderAndAftersaleStatisticsVO; -import com.wzj.soopin.order.domain.vo.OrderVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderDeliveryHistoryMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderDeliveryHistoryMapper.java index 427a80572..06a1e3a37 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderDeliveryHistoryMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderDeliveryHistoryMapper.java @@ -1,17 +1,8 @@ package com.wzj.soopin.order.mapper; -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory; -import com.wzj.soopin.order.domain.query.OrderDeliveryHistoryQuery; -import com.wzj.soopin.order.domain.vo.OrderDeliveryHistoryVO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderItemMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderItemMapper.java index 4752e013d..3179656aa 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderItemMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderItemMapper.java @@ -3,6 +3,7 @@ package com.wzj.soopin.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.wzj.soopin.order.domain.entity.OrderItem; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -20,4 +21,17 @@ public interface OrderItemMapper extends BaseMapper { * @return 订单中所包含的商品集合 */ List selectByEntity(OrderItem orderItem); + + /** + * 根据订单ID查询商品名称 + * + * @param orderId 订单ID + * @return 商品名称 + */ + @Select("SELECT p.name " + + "FROM oms_order_item oi " + + "JOIN pms_product p ON oi.product_id = p.id " + + "WHERE oi.order_id = #{orderId} " + + "LIMIT 1") + String getName(Long orderId); } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderMapper.java index eb02064bb..f6f506083 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderMapper.java @@ -7,13 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wzj.soopin.order.domain.bo.OrderBo; import com.wzj.soopin.order.domain.entity.Order; import org.apache.ibatis.annotations.Mapper; -import org.dromara.system.domain.SystemStatistics; import com.wzj.soopin.order.domain.form.ManagerOrderQueryForm; import com.wzj.soopin.order.domain.vo.*; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderOperateHistoryMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderOperateHistoryMapper.java index 7dfc273bd..c72a7bd49 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderOperateHistoryMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderOperateHistoryMapper.java @@ -1,13 +1,8 @@ package com.wzj.soopin.order.mapper; -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.wzj.soopin.order.domain.entity.OrderItem; import com.wzj.soopin.order.domain.entity.OrderOperateHistory; -import com.wzj.soopin.order.domain.query.OrderOperateHistoryQuery; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/VerificationCodesMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/VerificationCodesMapper.java index da8113787..a95593c13 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/VerificationCodesMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/VerificationCodesMapper.java @@ -3,12 +3,17 @@ package com.wzj.soopin.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.wzj.soopin.order.domain.entity.VerificationCodes; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; import java.time.LocalDateTime; -import java.util.List; +import java.util.Map; @Mapper public interface VerificationCodesMapper extends BaseMapper { + + LocalDateTime verificationTime(String code); + + Map getProduvtNameAndMemberId(String code); + + String getReason(String code); } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/WechatPaymentHistoryMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/WechatPaymentHistoryMapper.java index 1e1c7c453..4de9ea5d2 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/WechatPaymentHistoryMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/WechatPaymentHistoryMapper.java @@ -1,12 +1,8 @@ package com.wzj.soopin.order.mapper; -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.wzj.soopin.order.domain.entity.WechatPaymentHistory; -import com.wzj.soopin.order.domain.query.WechatPaymentHistoryQuery; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderItemService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderItemService.java index 7cb33c231..e13d219fc 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderItemService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderItemService.java @@ -8,4 +8,6 @@ import java.util.List; public interface OrderItemService extends IService { List findByOrderId(Long orderId); + + } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java index cd221052b..b8efe892c 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java @@ -1,15 +1,12 @@ package com.wzj.soopin.order.service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.wzj.soopin.order.domain.bo.OrderBo; import com.wzj.soopin.order.domain.entity.Order; import com.wzj.soopin.order.domain.vo.OrderVO; -import com.wzj.soopin.order.domain.vo.PageVO; -import java.util.Map; public interface OrderService extends IService { diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java index a890e404b..e3152fbfe 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java @@ -11,4 +11,8 @@ public interface VerificationCodeService extends IService { R generateVerificationCode(Long orderId); R verifyCode(CodeVerificationDto codeVerificationDto); + + void sendMessage(CodeVerificationDto codeVerificationDto); + + void sendMessageNo(CodeVerificationDto codeVerificationDto); } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleItemServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleItemServiceImpl.java index 0db985fa8..dac51ebf4 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleItemServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleItemServiceImpl.java @@ -1,21 +1,11 @@ package com.wzj.soopin.order.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wzj.soopin.order.domain.entity.AftersaleItem; -import com.wzj.soopin.order.domain.query.AftersaleItemQuery; -import com.wzj.soopin.order.domain.vo.PageVO; import com.wzj.soopin.order.mapper.AftersaleItemMapper; import com.wzj.soopin.order.service.AftersaleItemService; -import com.wzj.soopin.order.utils.PageUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; /** * 订单售后Service业务层处理 diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleServiceImpl.java index 5e16887fa..3737d5079 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/AftersaleServiceImpl.java @@ -1,6 +1,5 @@ package com.wzj.soopin.order.service.impl; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -20,27 +19,24 @@ import com.wzj.soopin.member.mapper.MemberMapper; import com.wzj.soopin.member.mapper.MemberWechatMapper; import com.wzj.soopin.order.domain.bo.AftersaleBo; import com.wzj.soopin.order.service.AftersaleService; -import com.wzj.soopin.order.convert.OrderOperateHistoryConvert; import com.wzj.soopin.order.domain.entity.*; import com.wzj.soopin.order.domain.form.DealWithAftersaleForm; -import com.wzj.soopin.order.domain.form.ManagerAftersaleOrderForm; import com.wzj.soopin.order.domain.vo.*; import com.wzj.soopin.order.mapper.*; import com.wzj.soopin.order.wechat.WechatPayService; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.event.Constants; import org.dromara.common.core.enums.AftersaleStatus; import org.dromara.common.core.enums.OrderRefundStatus; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import java.util.stream.Collectors; /** * 订单售后Service业务层处理 @@ -49,31 +45,22 @@ import java.util.stream.Collectors; */ @Service @Slf4j +@RequiredArgsConstructor public class AftersaleServiceImpl extends ServiceImpl implements AftersaleService { - @Autowired - private AftersaleMapper aftersaleMapper; + private final AftersaleMapper aftersaleMapper; + private final OrderMapper orderMapper; + private final OrderItemMapper orderItemMapper; + private final OrderOperateHistoryMapper orderOperateHistoryMapper; + private final MemberMapper memberMapper; + private final SkuMapper skuMapper; + private final WechatPaymentHistoryMapper wechatPaymentHistoryMapper; + private final MemberWechatMapper memberWechatMapper; + private final OrderOperateHistoryMapper operateHistoryMapper; - @Autowired - private OrderMapper orderMapper; - @Autowired - private OrderItemMapper orderItemMapper; - - @Autowired - private OrderOperateHistoryMapper orderOperateHistoryMapper; - - @Autowired - private MemberMapper memberMapper; - @Autowired - private SkuMapper skuMapper; - @Autowired - private WechatPaymentHistoryMapper wechatPaymentHistoryMapper; - @Autowired - private MemberWechatMapper memberWechatMapper; @Autowired(required = false) private WechatPayService wechatPayService; - @Autowired - private OrderOperateHistoryMapper operateHistoryMapper; + /** * 查询订单售后 @@ -307,7 +294,6 @@ public class AftersaleServiceImpl extends ServiceImpl getlist(Page page, AftersaleBo query) { - IPage resultPage = aftersaleMapper.getlist(page,query); - return resultPage; + return aftersaleMapper.getlist(page,query); } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderDeliveryHistoryServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderDeliveryHistoryServiceImpl.java index 4608dd297..30f05e21b 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderDeliveryHistoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderDeliveryHistoryServiceImpl.java @@ -1,22 +1,11 @@ package com.wzj.soopin.order.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory; -import com.wzj.soopin.order.domain.query.OrderDeliveryHistoryQuery; -import com.wzj.soopin.order.domain.vo.OrderDeliveryHistoryVO; -import com.wzj.soopin.order.domain.vo.PageVO; import com.wzj.soopin.order.mapper.OrderDeliveryHistoryMapper; import com.wzj.soopin.order.service.OrderDeliveryHistoryService; -import com.wzj.soopin.order.utils.PageUtil; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.util.List; /** * 订单发货记录Service业务层处理 diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderItemServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderItemServiceImpl.java index 66f886aad..03cd9e0af 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderItemServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderItemServiceImpl.java @@ -1,26 +1,12 @@ package com.wzj.soopin.order.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.member.domain.po.Member; -import com.wzj.soopin.order.domain.dto.OrderProductListDTO; import com.wzj.soopin.order.domain.entity.OrderItem; -import com.wzj.soopin.order.domain.query.OrderItemQuery; -import com.wzj.soopin.order.domain.vo.PageVO; import com.wzj.soopin.order.mapper.OrderItemMapper; import com.wzj.soopin.order.service.OrderItemService; -import com.wzj.soopin.order.utils.PageUtil; -import org.apache.commons.lang3.StringUtils; -import org.dromara.common.core.utils.IDGenerator; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; /** diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderOperateHistoryServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderOperateHistoryServiceImpl.java index 761560fac..05ea4d815 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderOperateHistoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderOperateHistoryServiceImpl.java @@ -1,24 +1,12 @@ package com.wzj.soopin.order.service.impl; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.order.domain.entity.OrderItem; import com.wzj.soopin.order.domain.entity.OrderOperateHistory; -import com.wzj.soopin.order.domain.query.OrderOperateHistoryQuery; -import com.wzj.soopin.order.domain.vo.PageVO; import com.wzj.soopin.order.mapper.OrderOperateHistoryMapper; import com.wzj.soopin.order.service.OrderOperateHistoryService; -import com.wzj.soopin.order.utils.PageUtil; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.util.List; - /** * 订单操作历史记录Service业务层处理 * diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java index 860b3bcd8..8ed8c8434 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java @@ -8,14 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.goods.convert.SkuConvert; import com.wzj.soopin.goods.domain.entity.Sku; -import com.wzj.soopin.goods.mapper.ProductMapper; import com.wzj.soopin.goods.mapper.SkuMapper; import com.wzj.soopin.member.domain.po.Member; import com.wzj.soopin.member.mapper.*; -import com.wzj.soopin.order.convert.OrderConvert; -import com.wzj.soopin.order.convert.OrderOperateHistoryConvert; import com.wzj.soopin.order.domain.bo.OrderBo; import com.wzj.soopin.order.domain.entity.Order; import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory; @@ -31,15 +27,20 @@ import com.wzj.soopin.order.mapper.OrderMapper; import com.wzj.soopin.order.mapper.OrderOperateHistoryMapper; import com.wzj.soopin.order.service.OrderService; import com.wzj.soopin.order.service.VerificationCodeService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.event.Constants; import org.dromara.common.core.utils.PhoneUtils; import org.dromara.common.core.utils.SecurityUtils; import org.dromara.system.domain.SysTenant; -import org.dromara.system.mapper.SysOperLogMapper; +import org.dromara.system.domain.bo.SysMessageBo; +import org.dromara.system.domain.vo.SysMessageTemplateVo; import org.dromara.system.mapper.SysTenantMapper; +import org.dromara.system.service.ISysMessageTemplateService; +import org.dromara.system.service.impl.SysMessageServiceImpl; +import org.dromara.system.service.impl.SysMessageTemplateServiceImpl; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -56,6 +57,8 @@ import java.util.stream.Collectors; * @author zcc */ @Service +@Slf4j +@RequiredArgsConstructor public class OrderServiceImpl extends ServiceImpl implements OrderService { private final OrderMapper orderMapper; private final OrderItemMapper orderItemMapper; @@ -65,19 +68,8 @@ public class OrderServiceImpl extends ServiceImpl implements private final OrderDeliveryHistoryMapper orderDeliveryHistoryMapper; private final VerificationCodeService verificationCodeService; private final SysTenantMapper sysTenantMapper; - - public OrderServiceImpl(OrderMapper orderMapper, OrderItemMapper orderItemMapper, SkuMapper skuMapper, - OrderOperateHistoryMapper orderOperateHistoryMapper, MemberMapper memberMapper, OrderDeliveryHistoryMapper orderDeliveryHistoryMapper, VerificationCodeService verificationCodeService, SysTenantMapper sysTenantMapper) { - this.orderMapper = orderMapper; - this.orderItemMapper = orderItemMapper; - this.skuMapper = skuMapper; - this.orderOperateHistoryMapper = orderOperateHistoryMapper; - this.memberMapper = memberMapper; - this.orderDeliveryHistoryMapper = orderDeliveryHistoryMapper; - this.verificationCodeService = verificationCodeService; - this.sysTenantMapper = sysTenantMapper; - } - + private final ISysMessageTemplateService templateService; + private final SysMessageServiceImpl sysMessageService; /** * 查询订单表 @@ -525,28 +517,32 @@ public class OrderServiceImpl extends ServiceImpl implements return resultPage; } -// @Override -// public Map getCount() { -// Map result = new HashMap<>(); -// result.put("MemberCount", memberMapper.countMember()); -// result.put("storeCount", sysTenantMapper.countStore()); -// result.put("productCount", productMapper.countProduct()); -// result.put("orderCount", orderMapper.countOrder()); -// -// -// -//// result.put("productAudit", productMapper.AuditProduct()); -//// -//// List> incomeExpenseList = incomeExpenseMapper.getIncomeExpenseByMonth(); -//// result.put("incomeExpense", incomeExpenseList); -// -// return result; -// } - @Override public Order getByNo(String orderNo) { return baseMapper.selectOne(new LambdaQueryWrapper().eq(Order::getOrderSn,orderNo)); } + + public void sendMessage(Order order) { + Long memberId = order.getMemberId(); + Long orderId = order.getId(); + // 订单创建成功模板ID + Long templateId =1940586928850100226L; + // 查询模板信息 + SysMessageTemplateVo template = templateService.selectTemplateById(templateId); + log.info("模板信息为: {}", template); + + if (template != null) { + String content = template.getTemplateContent() + .replace("${orderSn}", order.getOrderSn()) + .replace("${productName}", orderItemMapper.getName(orderId)); + log.info("模板内容为: {}", content); + SysMessageBo messageBo = new SysMessageBo(); + messageBo.setTitle(template.getTitle()); + messageBo.setContent(content); + messageBo.setSenderId(memberId); + sysMessageService.sendMessageToUser(messageBo, memberId); + } + } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java index 5fdf6ff3f..ef024ba0f 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java @@ -12,18 +12,26 @@ import com.wzj.soopin.order.mapper.VerificationLogsMapper; import com.wzj.soopin.order.service.VerificationCodeService; import com.wzj.soopin.order.utils.QrCodeGenerator; import com.wzj.soopin.order.utils.StringUtils; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.RandomStringUtils; import org.dromara.common.core.domain.R; -import org.springframework.beans.factory.annotation.Autowired; +import org.dromara.system.domain.bo.SysMessageBo; +import org.dromara.system.domain.vo.SysMessageTemplateVo; +import org.dromara.system.service.ISysMessageTemplateService; +import org.dromara.system.service.impl.SysMessageServiceImpl; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.Map; +/** + * @author fxh + */ @Service @Slf4j +@RequiredArgsConstructor public class VerificationCodeServiceImpl extends ServiceImpl implements VerificationCodeService{ @@ -32,13 +40,8 @@ public class VerificationCodeServiceImpl extends ServiceImpl() .eq(VerificationLogs::getOrderId, code.getOrderId()) - .eq(VerificationLogs::getResult, 1) // 只检查成功核销的记录 + .eq(VerificationLogs::getResult, 1) ); if (existingLog != null) { @@ -158,7 +161,7 @@ public class VerificationCodeServiceImpl extends ServiceImpl resultMap = codeMapper.getProduvtNameAndMemberId(code); + String productName = (String) resultMap.get("productName"); + Long memberId = (Long) resultMap.get("memberId"); + + LocalDateTime verificationTime = codeMapper.verificationTime(code); + String formattedTime = verificationTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + + + // 核销成功模板ID + Long templateId = 1940678210012340225L; + // 查询模板信息 + SysMessageTemplateVo template = templateService.selectTemplateById(templateId); + log.info("模板信息为: {}", template); + + if (template != null) { + String content = template.getTemplateContent() + .replace("${productName}", productName) + .replace("${verificationTime}",formattedTime); + log.info("模板内容为: {}", content); + SysMessageBo messageBo = new SysMessageBo(); + messageBo.setTitle(template.getTitle()); + messageBo.setContent(content); + messageBo.setSenderId(memberId); + sysMessageService.sendMessageToUser(messageBo, memberId); + } + } + + @Override + public void sendMessageNo(CodeVerificationDto codeVerificationDto) { + String code = codeVerificationDto.getCodeValue(); + + Map resultMap = codeMapper.getProduvtNameAndMemberId(code); + String productName = (String) resultMap.get("productName"); + Long memberId = (Long) resultMap.get("memberId"); + + String reason = codeMapper.getReason(code); + + // 核销成功模板ID + Long templateId = 1940687666448195586L; + // 查询模板信息 + SysMessageTemplateVo template = templateService.selectTemplateById(templateId); + log.info("模板信息为: {}", template); + + if (template != null) { + String content = template.getTemplateContent() + .replace("${productName}", productName) + .replace("${reason}",reason); + log.info("模板内容为: {}", content); + SysMessageBo messageBo = new SysMessageBo(); + messageBo.setTitle(template.getTitle()); + messageBo.setContent(content); + messageBo.setSenderId(memberId); + sysMessageService.sendMessageToUser(messageBo, memberId); + } + } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationLogsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationLogsServiceImpl.java index 775239deb..e587c269c 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationLogsServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationLogsServiceImpl.java @@ -6,6 +6,9 @@ import com.wzj.soopin.order.mapper.VerificationLogsMapper; import com.wzj.soopin.order.service.VerificationLogsService; import org.springframework.stereotype.Service; +/** + * @author fengxiaohang + */ @Service public class VerificationLogsServiceImpl extends ServiceImpl implements VerificationLogsService { } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/WechatPaymentHistoryServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/WechatPaymentHistoryServiceImpl.java index a4ff22b52..ef4fa7f56 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/WechatPaymentHistoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/WechatPaymentHistoryServiceImpl.java @@ -1,22 +1,11 @@ package com.wzj.soopin.order.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wzj.soopin.order.domain.entity.WechatPaymentHistory; -import com.wzj.soopin.order.domain.query.WechatPaymentHistoryQuery; -import com.wzj.soopin.order.domain.vo.PageVO; import com.wzj.soopin.order.mapper.WechatPaymentHistoryMapper; import com.wzj.soopin.order.service.WechatPaymentHistoryService; -import com.wzj.soopin.order.utils.PageUtil; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; /** * 微信订单表Service业务层处理 diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/VerificationCodeMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/VerificationCodeMapper.xml new file mode 100644 index 000000000..c0cbabd35 --- /dev/null +++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/VerificationCodeMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysVersionController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysVersionController.java new file mode 100644 index 000000000..357c5692c --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysVersionController.java @@ -0,0 +1,57 @@ +package org.dromara.system.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.system.domain.SysVersion; +import org.dromara.system.domain.bo.SysVersionBo; +import org.dromara.system.domain.vo.SysVersionVo; +import org.dromara.system.service.ISysVerisonService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * @author fxh + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/version") +public class SysVersionController { + + private final ISysVerisonService sysVerisonService; + + @Tag(name ="查询app版本管理") + @PostMapping("/list") + public R> list(@RequestBody SysVersionBo query, Page page){ + return R.ok(sysVerisonService.getList(page,query)); + } + + @Tag(name = "新增app版本管理") + @Log(title = "新增app版本管理", businessType = BusinessType.INSERT) + @PostMapping("/add") + public R add(@RequestBody SysVersion sysVersion) { + return R.ok(sysVerisonService.save(sysVersion)); + } + + @Tag(name ="修改状态") + @Log(title = "修改状态", businessType = BusinessType.UPDATE) + @GetMapping("/update") + public R updateStatus( @RequestParam Long id, + @RequestParam Integer status) { + return R.ok(sysVerisonService.updateStatus(id,status)); + } + + @Tag(name ="删除版本管理") + @Log(title = "删除版本管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public R remove(@PathVariable Long id) { + return R.ok(sysVerisonService.removeById(id)); + } + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysVersion.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysVersion.java new file mode 100644 index 000000000..da2464ada --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysVersion.java @@ -0,0 +1,37 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.model.BaseAudit; + +@Data +@TableName("sys_version") +public class SysVersion extends BaseAudit { + + @Schema(description = "id") + private Long id; + + @Schema(description = "平台类型") + private String platformType; + + @Schema(description = "版本号") + private String versionCode; + + @Schema(description = "版本名称") + private String versionName; + + @Schema(description = "下载地址") + private String downloadUrl; + + @Schema(description = "是否强制更新（0否、1是）") + private Integer isForceUpdate; + + @Schema(description = "版本说明") + private String releaseNotes; + + @Schema(description = "状态（0停用/1启用）") + private Integer status; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysVersionBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysVersionBo.java new file mode 100644 index 000000000..19660399f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysVersionBo.java @@ -0,0 +1,17 @@ +package org.dromara.system.domain.bo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class SysVersionBo { + + @Schema(description = "平台类型（ios/android）") + private String platformType; + + @Schema(description = "版本号") + private String versionCode; + + @Schema(description = "版本名称") + private String versionName; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysVersionVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysVersionVo.java new file mode 100644 index 000000000..16b9d5089 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysVersionVo.java @@ -0,0 +1,36 @@ +package org.dromara.system.domain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.model.BaseAudit; + +@Data +public class SysVersionVo extends BaseAudit { + + @Schema(description = "id") + private Long id; + + @Schema(description = "平台类型") + private String platformType; + + @Schema(description = "版本号") + private String versionCode; + + @Schema(description = "版本名称") + private String versionName; + + @Schema(description = "下载地址") + private String downloadUrl; + + @Schema(description = "是否强制更新（0否、1是）") + private Integer isForceUpdate; + + @Schema(description = "版本说明") + private String releaseNotes; + + @Schema(description = "状态（0停用/1启用）") + private Integer status; + + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysVerisonMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysVerisonMapper.java new file mode 100644 index 000000000..5831fe443 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysVerisonMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.system.domain.SysVersion; +import org.dromara.system.domain.bo.SysVersionBo; +import org.dromara.system.domain.vo.SysVersionVo; + +@Mapper +public interface SysVerisonMapper extends BaseMapper { + + IPage getList(@Param("page") Page page, @Param("query") SysVersionBo query); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysVerisonService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysVerisonService.java new file mode 100644 index 000000000..bc0d01604 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysVerisonService.java @@ -0,0 +1,15 @@ +package org.dromara.system.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.system.domain.SysVersion; +import org.dromara.system.domain.bo.SysVersionBo; +import org.dromara.system.domain.vo.SysVersionVo; + +public interface ISysVerisonService extends IService { + + IPage getList(Page page, SysVersionBo query); + + SysVersion updateStatus(Long id, Integer status); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysVerisonServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysVerisonServiceImpl.java new file mode 100644 index 000000000..7d6de2ab4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysVerisonServiceImpl.java @@ -0,0 +1,37 @@ +package org.dromara.system.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.system.domain.SysVersion; +import org.dromara.system.domain.bo.SysVersionBo; +import org.dromara.system.domain.vo.SysVersionVo; +import org.dromara.system.mapper.SysVerisonMapper; +import org.dromara.system.service.ISysVerisonService; +import org.springframework.stereotype.Service; + +@Slf4j +@RequiredArgsConstructor +@Service +public class SysVerisonServiceImpl extends ServiceImpl implements ISysVerisonService { + + private final SysVerisonMapper sysVerisonMapper; + + @Override + public IPage getList(Page page, SysVersionBo query) { + return sysVerisonMapper.getList(page,query); + } + + @Override + public SysVersion updateStatus(Long id, Integer status) { + SysVersion sysVersion = sysVerisonMapper.selectById(id); + if (sysVersion == null) { + throw new RuntimeException("版本不存在"); + } + sysVersion.setStatus(status); + sysVerisonMapper.updateById(sysVersion); + return sysVersion; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysVersionMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysVersionMapper.xml new file mode 100644 index 000000000..4c515f9a0 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysVersionMapper.xml @@ -0,0 +1,26 @@ + + + + + + +