From 1d86ef3d03e19620a5d6dc15cff070cb57c31a91 Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Tue, 18 Nov 2025 12:11:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=94=AE=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 71 +-- .../cn/xluobo/OauthServerApplication.java | 9 +- .../resp/RespBusinessChooseCourseInfo.java | 3 + .../order/domain/req/ReqBusinessSignUp.java | 1 + .../sc/order/domain/resp/RespOrder.java | 4 + .../sc/order/repo/mapping/ScOrderMapper.xml | 4 +- .../business/sc/order/repo/model/ScOrder.java | 5 + .../order/service/BusinessScOrderService.java | 24 +- .../ScCommissionPlansController.java | 14 +- .../student/repo/model/ScStudentCourse.java | 2 +- .../service/impl/ISysDictDataServiceImpl.java | 3 +- .../controller/common/CommonController.java | 70 ++- .../controller/mall/AftersaleController.java | 107 ++++ .../controller/mall/ExpressController.java | 85 ++++ .../web/controller/mall/OrderController.java | 141 ++++++ .../controller/mall/ProductController.java | 11 +- .../web/controller/mall/SkuController.java | 85 ++++ .../system/SysDictDataController.java | 23 +- .../controller/system/SysUserController.java | 2 + .../common/core/domain/entity/SysDept.java | 10 +- .../web/service/UserDetailsServiceImpl.java | 25 +- .../java/com/ruoyi/mall/domain/Address.java | 48 ++ .../java/com/ruoyi/mall/domain/AppUser.java | 99 ++++ .../java/com/ruoyi/mall/domain/Express.java | 31 ++ .../com/ruoyi/mall/domain/MemberAddress.java | 80 +++ .../mall/domain/OrderDeliveryHistory.java | 34 ++ .../java/com/ruoyi/mall/domain/OrderItem.java | 84 ++++ .../mall/domain/OrderOperateHistory.java | 42 ++ .../java/com/ruoyi/mall/domain/Product.java | 3 + .../main/java/com/ruoyi/mall/domain/Sku.java | 2 + .../com/ruoyi/mall/domain/dto/AddressDTO.java | 19 + .../domain/form/DealWithAftersaleForm.java | 22 + .../form/ManagerAftersaleOrderForm.java | 40 ++ .../mall/domain/query/DeliverProductForm.java | 27 + .../domain/query/ManagerOrderQueryForm.java | 54 ++ .../mall/domain/query/OrderItemQuery.java | 57 +++ .../com/ruoyi/mall/domain/query/SkuQuery.java | 2 + .../mall/domain/vo/ManagerOrderAddressVo.java | 24 + .../mall/domain/vo/ManagerOrderDetailVO.java | 45 ++ .../mall/domain/vo/ManagerOrderProductVO.java | 23 + .../ruoyi/mall/domain/vo/ManagerOrderVO.java | 102 ++++ .../domain/vo/ManagerRefundOrderDetailVO.java | 50 ++ .../mall/domain/vo/ManagerRefundOrderVO.java | 84 ++++ .../ruoyi/mall/domain/vo/OrderAddressVO.java | 24 + .../mall/domain/vo/OrderOperateHistoryVO.java | 31 ++ .../com/ruoyi/mall/domain/vo/ProductVO.java | 6 + .../ruoyi/mall/domain/vo/RefundInfoVO.java | 48 ++ .../com/ruoyi/mall/mapper/AddressMapper.java | 21 + .../ruoyi/mall/mapper/AftersaleMapper.java | 7 + .../com/ruoyi/mall/mapper/ExpressMapper.java | 14 + .../mall/mapper/MemberAddressMapper.java | 25 + .../mapper/OrderDeliveryHistoryMapper.java | 21 + .../ruoyi/mall/mapper/OrderItemMapper.java | 21 + .../com/ruoyi/mall/mapper/OrderMapper.java | 12 + .../mapper/OrderOperateHistoryMapper.java | 21 + .../ruoyi/mall/mapper/YjAppUserMapper.java | 18 + .../ruoyi/mall/service/AftersaleService.java | 463 ++++++++++++++++++ .../ruoyi/mall/service/ExpressService.java | 90 ++++ .../ruoyi/mall/service/OrderItemService.java | 142 ++++++ .../com/ruoyi/mall/service/OrderService.java | 330 +++++++++++++ .../ruoyi/mall/service/ProductService.java | 8 +- .../com/ruoyi/mall/service/SkuService.java | 119 +++++ .../ruoyi/system/domain/vo/UploadImageVO.java | 15 + .../system/service/impl/FileServiceImpl.java | 4 +- .../service/impl/SysTenantServiceImpl.java | 4 +- .../resources/mapper/mall/AddressMapper.xml | 34 ++ .../resources/mapper/mall/AftersaleMapper.xml | 47 +- .../resources/mapper/mall/ExpressMapper.xml | 7 + .../mapper/mall/MemberAddressMapper.xml | 102 ++++ .../mall/OrderDeliveryHistoryMapper.xml | 34 ++ .../resources/mapper/mall/OrderItemMapper.xml | 56 +++ .../resources/mapper/mall/OrderMapper.xml | 142 +++++- .../mapper/mall/OrderOperateHistoryMapper.xml | 37 ++ .../resources/mapper/mall/YjAppUserMapper.xml | 8 + 74 files changed, 3454 insertions(+), 128 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/AftersaleController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/ExpressController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/OrderController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/mall/SkuController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/Address.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/AppUser.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/Express.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/MemberAddress.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/OrderDeliveryHistory.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/OrderItem.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/OrderOperateHistory.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/dto/AddressDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/form/DealWithAftersaleForm.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/form/ManagerAftersaleOrderForm.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/query/DeliverProductForm.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/query/ManagerOrderQueryForm.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/query/OrderItemQuery.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ManagerOrderAddressVo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ManagerOrderDetailVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ManagerOrderProductVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ManagerOrderVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ManagerRefundOrderDetailVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/ManagerRefundOrderVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/OrderAddressVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/OrderOperateHistoryVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/domain/vo/RefundInfoVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/mapper/AddressMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/mapper/ExpressMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MemberAddressMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/mapper/OrderDeliveryHistoryMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/mapper/OrderItemMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/mapper/OrderOperateHistoryMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/mapper/YjAppUserMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/service/AftersaleService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/service/ExpressService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/service/OrderItemService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/service/OrderService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/mall/service/SkuService.java create mode 100644 ruoyi-system/src/main/resources/mapper/mall/AddressMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/mall/ExpressMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/mall/MemberAddressMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/mall/OrderDeliveryHistoryMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/mall/OrderItemMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/mall/OrderOperateHistoryMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/mall/YjAppUserMapper.xml diff --git a/README.md b/README.md index 05996fe..dd1e27d 100644 --- a/README.md +++ b/README.md @@ -1,68 +1,5 @@ -## 平台简介 +原：https://gitee.com/zccbbg/RuoYi-Mall.git -若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。我们在此基础上开发了ruoyi-mall，希望能给做商城的朋友减轻工作量。 - -* 前端采用Vue、Element UI。 -* 后端采用Spring Boot、Spring Security、Redis & Jwt。 -* 权限认证使用Jwt，支持多终端认证系统。 -* 支持加载动态权限菜单，多方式轻松权限控制。 -* 高效率开发，使用代码生成器可以一键生成前后端代码。 - -## B站讲解视频 -https://www.bilibili.com/video/BV16N4y1d7MM -## 若依视频教程 -对若依框架不了解，不知道怎么部署、修改密码等操作的，请参考：https://www.bilibili.com/video/BV1Fi4y1q74p/ -## 本地运行文档 -https://docs.ichengle.top/mall/run.html -## 系统部署文档 -https://docs.ichengle.top/mall/ops.html -## 特别注意 -jdk请选择1.8~11之间的，不然mybaties会报错 - -## 项目地址 -| | gitee | github | -|:--------------:|:----------------------------------------|:---------------------------------------------| -| 管理端vue element | https://gitee.com/zccbbg/ruoyi-mall-vue | https://github.com/zccbbg/ruoyi-mall-vue | -| h5 uniapp | https://gitee.com/zccbbg/ruoyi-mall-uniapp | https://github.com/zccbbg/ruoyi-mall-uniapp | - -## 在线体验 -### 管理后台演示地址 -http://mall.ichengle.top -### 小程序和h5 - - - -## 若依技术专栏 -关注文末公众号回复：星球 - -## 若依mall功能 -1. 首页： -![img.png](doc/首页.png) -2. PMS商品管理： - ![img.png](doc/商品.png) - ![img.png](doc/商品列表.png) -3. UMS会员管理： -会员列表： -![img.png](doc/会员列表.png) -购物车： -![img.png](doc/会员购物车.png) -4. OMS订单管理： -订单列表： -![img.png](doc/订单.png) -售后列表： - ![img.png](doc/售后.png) -5. SMS营销管理： -![img.png](doc/优惠券.png) - ![img.png](doc/积分.png) -6. CMS内容管理： -![img.png](doc/内容管理.png) - -## 科技企业招聘、内推渠道 -如果投简历经常已读不回，可以试试这个小程序，回复率相对高一点： -![内推](doc/内推.png) - -## 交流群/技术支持 -| 公众号 | -|:------------------------------------------:| -| | -扫公众号二维码，关注后，回复：“加群” \ No newline at end of file +打包前修改数据库连接配置类： +com.ruoyi.common.db.SshContextListener +注释掉：@Component @WebListener diff --git a/ruoyi-admin/src/main/java/cn/xluobo/OauthServerApplication.java b/ruoyi-admin/src/main/java/cn/xluobo/OauthServerApplication.java index d5b8b27..b1a0bab 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/OauthServerApplication.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/OauthServerApplication.java @@ -1,15 +1,12 @@ package cn.xluobo; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.transaction.annotation.EnableTransactionManagement; import java.net.UnknownHostException; -@SpringBootApplication(scanBasePackages = {"cn.xluobo","cn.jljiayu"}) -@EnableTransactionManagement -@MapperScan(value = {"cn.xluobo.*.*.*.repo.mapper"}) +//@SpringBootApplication(scanBasePackages = {"cn.xluobo","cn.jljiayu"}) +//@EnableTransactionManagement +//@MapperScan(value = {"cn.xluobo.*.*.*.repo.mapper"}) public class OauthServerApplication { public static void main(String[] args) throws UnknownHostException { diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessChooseCourseInfo.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessChooseCourseInfo.java index efe396d..6ceb246 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessChooseCourseInfo.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessChooseCourseInfo.java @@ -1,5 +1,7 @@ package cn.xluobo.business.sc.course.domain.resp; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Builder; import lombok.Data; @@ -15,6 +17,7 @@ import java.util.List; @Builder public class RespBusinessChooseCourseInfo { + @JsonSerialize(using = ToStringSerializer.class) private Long courseId; private String courseName; diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/req/ReqBusinessSignUp.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/req/ReqBusinessSignUp.java index 984c0f6..4bee154 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/req/ReqBusinessSignUp.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/req/ReqBusinessSignUp.java @@ -17,6 +17,7 @@ import java.util.List; public class ReqBusinessSignUp { private Long studentId; + private Long commissionPlansId; // 经办校区 private Long handleDepartId; diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/resp/RespOrder.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/resp/RespOrder.java index 970b466..87b2534 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/resp/RespOrder.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/resp/RespOrder.java @@ -1,5 +1,7 @@ package cn.xluobo.business.sc.order.domain.resp; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.math.BigDecimal; @@ -11,6 +13,8 @@ import java.math.BigDecimal; @Data public class RespOrder { + + @JsonSerialize(using = ToStringSerializer.class) private Long orderId; private String orderType; diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/repo/mapping/ScOrderMapper.xml b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/repo/mapping/ScOrderMapper.xml index 677654f..b14b414 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/repo/mapping/ScOrderMapper.xml +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/repo/mapping/ScOrderMapper.xml @@ -5,9 +5,9 @@ + + + and code = #{code} + and parent_code = #{parentCode} + and name like concat('%', #{name}, '%') + and level = #{level} + and created_at = #{createdAt} + and updated_at = #{updatedAt} + and deleted_at = #{deletedAt} + + + diff --git a/ruoyi-system/src/main/resources/mapper/mall/AftersaleMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/AftersaleMapper.xml index 7d4c559..af3f4a3 100644 --- a/ruoyi-system/src/main/resources/mapper/mall/AftersaleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/mall/AftersaleMapper.xml @@ -15,5 +15,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL(sum(case when status=1 then 1 else 0 end), 0) processingAftersaleCount from oms_aftersale - + diff --git a/ruoyi-system/src/main/resources/mapper/mall/ExpressMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/ExpressMapper.xml new file mode 100644 index 0000000..fc7a276 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/mall/ExpressMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-system/src/main/resources/mapper/mall/MemberAddressMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/MemberAddressMapper.xml new file mode 100644 index 0000000..332cf2f --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/mall/MemberAddressMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, member_id, name, phone_hidden,phone_encrypted, default_status, post_code, province, city, district, detail_address, is_default, create_by, create_time, update_by, update_time from mall_member_address + + + + + + update mall_member_address + + + member_id = #{memberId, jdbcType=BIGINT}, + + + name = #{name, jdbcType=BIGINT}, + + + phone = #{phone, jdbcType=BIGINT}, + + + default_status = #{defaultStatus, jdbcType=BIGINT}, + + + post_code = #{postCode, jdbcType=BIGINT}, + + + province = #{province, jdbcType=BIGINT}, + + + city = #{city, jdbcType=BIGINT}, + + + district = #{district, jdbcType=BIGINT}, + + + detail_address = #{detailAddress, jdbcType=BIGINT}, + + + is_default = #{isDefault, jdbcType=BIGINT}, + + + create_by = #{createBy, jdbcType=BIGINT}, + + + create_time = #{createTime, jdbcType=BIGINT}, + + + update_by = #{updateBy, jdbcType=BIGINT}, + + + update_time = #{updateTime, jdbcType=BIGINT}, + + + where id = #{id, jdbcType=BIGINT} + + + update mall_member_address + set is_default = #{param1} + where member_id = #{param2} + + diff --git a/ruoyi-system/src/main/resources/mapper/mall/OrderDeliveryHistoryMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/OrderDeliveryHistoryMapper.xml new file mode 100644 index 0000000..5517bd7 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/mall/OrderDeliveryHistoryMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + select id, order_id, delivery_company, delivery_sn, create_by, create_time, update_by, update_time from oms_order_delivery_history + + + + diff --git a/ruoyi-system/src/main/resources/mapper/mall/OrderItemMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/OrderItemMapper.xml new file mode 100644 index 0000000..221aec8 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/mall/OrderItemMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, order_id, product_id, out_product_id, sku_id, out_sku_id, product_snapshot_id, sku_snapshot_id, pic, product_name, sale_price, purchase_price, quantity, product_category_id, sp_data, create_by, create_time, update_by, update_time from oms_order_item + + + + diff --git a/ruoyi-system/src/main/resources/mapper/mall/OrderMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/OrderMapper.xml index 4b10a07..66c147b 100644 --- a/ruoyi-system/src/main/resources/mapper/mall/OrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/mall/OrderMapper.xml @@ -4,6 +4,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + select id, member_id, member_username, total_amount, purchase_price, pay_amount, freight_amount, pay_type, status, aftersale_status, delivery_company, delivery_sn, auto_confirm_day, receiver_name, receiver_phone, receiver_post_code, receiver_province, receiver_city, receiver_district, receiver_province_id, receiver_city_id, receiver_district_id, receiver_detail_address, note, confirm_status, delete_status, payment_time, delivery_time, receive_time, create_by, create_time, update_by, update_time from oms_order + @@ -16,6 +19,143 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from oms_order where create_time between #{startTime} and #{endTime} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-system/src/main/resources/mapper/mall/OrderOperateHistoryMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/OrderOperateHistoryMapper.xml new file mode 100644 index 0000000..79ca22c --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/mall/OrderOperateHistoryMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, order_id, operate_man, order_status, note, create_by, create_time, update_by, update_time from oms_order_operate_history + + + + diff --git a/ruoyi-system/src/main/resources/mapper/mall/YjAppUserMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/YjAppUserMapper.xml new file mode 100644 index 0000000..21bede6 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/mall/YjAppUserMapper.xml @@ -0,0 +1,8 @@ + + + + + +