Commit Graph

155 Commits (7345d80b53350da3d5b52afd0d31b0e974ea9e07)

Author SHA1 Message Date
jason 7345d80b53 新增商品收藏功能 2023-05-04 15:52:42 +08:00
puhui999 810c7ed040 完善商品管理 2023-05-04 01:32:25 +08:00
puhui999 c233ce1a20 合并分支修复差异 2023-05-03 22:18:27 +08:00
puhui999 e163ae8b70 完成商品保存和编辑数据回显 2023-05-03 02:31:50 +08:00
puhui999 70816371e5 初步完成商品CRUD 2023-05-02 02:33:14 +08:00
YunaiV da162853ec 商城:完善购物车的逻辑 2023-04-30 20:32:01 +08:00
puhui999 15ced47b17 添加多租户 2023-04-30 17:35:38 +08:00
puhui999 c10ea9d9de 移除ProductSku相关的status属性,修改Property 2023-04-30 17:35:05 +08:00
puhui999 24a56bb45f 移除ProductSku相关的status属性,修改Property 2023-04-30 17:34:56 +08:00
puhui999 f56d394830 修改ProductSpuBaseVO第一版 2023-04-29 21:28:09 +08:00
puhui999 668d493b7f Product相关Do添加TenantBaseDO 2023-04-29 21:22:52 +08:00
YunaiV 2113e825d7 完善 App 商品详情逻辑的 10% 2023-04-27 22:43:37 +08:00
YunaiV 3ced6a3240 完善 App 商品搜索的逻辑 2023-04-26 20:13:12 +08:00
puhui999 4068548c45 移除ProductSpuSpecTypeEnum及相关引用 2023-04-26 17:38:42 +08:00
YunaiV a5f018104e 调整商品分类的实现 2023-04-25 21:33:59 +08:00
puhui999 c3e36ba9da 修正相关问题让服务正常启动,改动位置都已加上TODO记录 2023-04-24 10:50:40 +08:00
puhui999 6786aa352b 修正DO对齐数据库表字段,VO对齐前端 2023-04-24 10:29:02 +08:00
YunaiV 32da5aae84 商城:product:完善 ProductSpuDO 表 2023-04-19 18:07:22 +08:00
YunaiV 63542b4ccb 商城:product:完善 ProductSkuDO 表 2023-04-19 16:30:57 +08:00
YunaiV b30fc28021 商城:product:完善 ProductSpuDO 表 2023-04-19 10:55:43 +08:00
wangzhs 38d7d75f7f [新增][商品评价]管理后台/APP端
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
2023-03-23 14:06:14 +08:00
wangzhs 6fe5f4bc0d [新增][商品评价]管理后台/APP端 2023-03-21 11:09:10 +08:00
wangzhs cbf5ef5953 [新增][商品评价]管理后台
1. 显示 / 隐藏评论
2. 商家回复
2023-03-19 22:07:07 +08:00
wangzhs da53a041da [新增][商品评价]管理后台分页查询 2023-03-19 18:59:51 +08:00
wangzhs f69d8503a2 [新增][商品评价]
1. 实体类
2. h2.sql
2023-03-19 15:47:49 +08:00
wangzhs b0c73b786a [测试][商品分类]测试创建商品分类 2023-03-15 14:23:42 +08:00
wangzhs 5674bfafc8 [修改][商品分类]分类只能存在2级 2023-03-15 14:03:00 +08:00
wangzhs b89d7ff384 [修改][商品分类]
1. 删除 description 分类描述字段
2. 新增big_pic_url PC端分类图字段
2023-03-15 13:44:13 +08:00
wangzhs 4a01348e0b [新增][商品分类] 列表查询筛选增加 status、parentId 字段 2023-03-15 11:36:45 +08:00
YunaiV 6bf5eb0133 适配 mall 模块的 openapi 2023-02-04 13:06:54 +08:00
YunaiV c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
2023-02-04 10:21:45 +08:00
xingyu 854ba3315c marge master 2023-01-04 10:57:19 +08:00
xingyu 7b98a3f3f3 Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	README.md
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
#	yudao-server/pom.xml
#	yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
2023-01-04 10:48:18 +08:00
dengxiaobing df2c137fe2 清理单元测试 sql 脚本 2022-12-30 10:10:43 +08:00
YunaiV a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
YunaiV 92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
2022-12-23 19:12:45 +08:00
YunaiV 7a4a6a3046 product:优化管理后台相关的接口
area:增加地区列表界面
2022-12-23 18:47:59 +08:00
xingyu cacefb4eea feat: knife4j springdoc 2022-12-22 00:25:22 +08:00
YunaiV 92dde0b48b product:优化更新 SKU 的代码 2022-12-15 21:31:52 +08:00
YunaiV d453301455 product:完善 App 商品分页接口 2022-12-15 19:48:21 +08:00
YunaiV 652428a723 product:完善 App 商品详情接口 2022-12-14 22:02:07 +08:00
YunaiV 2f9eef589b product:优化商品分类的代码 2022-12-14 20:32:44 +08:00
YunaiV 4a2cb33cd7 product:优化商品属性值的代码 2022-12-12 23:40:23 +08:00
YunaiV 98ca807d4b product:优化商品属性项的代码 2022-12-12 22:25:31 +08:00
xingyu4j 9fc6e0f00b refactor: springdoc 替换 springfox 2022-12-09 13:43:15 +08:00
YunaiV fe1ae23b71 trade:增加管理后台的订单分页接口 2022-12-09 00:20:38 +08:00
YunaiV fac3e7c726 product:商品规格,调整成商品属性,避免和 sku 概念冲突 2022-12-08 21:12:35 +08:00
xingyu 0d0f64e30a feat: 删除过期方法 2022-11-23 22:54:44 +08:00
YunaiV 73b92190c6 trade:【交易售后】增加申请售后的单元测试 2022-11-19 14:34:59 +08:00
YunaiV af71a19241 trade:【商品】sku 表增加 spu_name 字段,冗余 2022-11-19 12:25:53 +08:00