puhui999
|
5cfcaa1a6e
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.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/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
|
2023-06-12 12:18:27 +08:00 |
|
puhui999
|
9ff873fe53
|
fix：完善商品评论测试 sql
|
2023-06-12 12:09:16 +08:00 |
|
puhui999
|
20100aa78b
|
fix：完善商品评论
|
2023-06-12 12:08:55 +08:00 |
|
YunaiV
|
9e894e0430
|
mall + promotion：增加优惠劵的 mock 接口
|
2023-06-10 09:57:37 +08:00 |
|
YunaiV
|
1e1a22c256
|
mall + product：评论的 review
|
2023-06-09 22:41:16 +08:00 |
|
YunaiV
|
f2d803c111
|
mall + product：review 评论接口
|
2023-06-09 13:59:04 +08:00 |
|
puhui999
|
91e357e59d
|
fix：移动 app 商品评论分页相关常量到 AppCommentPageReqVO 中
|
2023-06-08 17:15:37 +08:00 |
|
puhui999
|
8f7efbe4e2
|
fix：测试 app 商品评论页获取评论分页接口和相关评论分类数量接口，修复测试时发现的问题
|
2023-06-08 16:14:23 +08:00 |
|
puhui999
|
8d2bcc57aa
|
fix: 完善商品管理
|
2023-06-01 11:41:26 +08:00 |
|
puhui999
|
e86214015d
|
fix: 完善商品管理
|
2023-05-31 16:39:43 +08:00 |
|
YunaiV
|
c62da6a056
|
mall：review 商品接口
|
2023-05-23 23:27:15 +08:00 |
|
puhui999
|
cac5545762
|
fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试
|
2023-05-23 11:01:40 +08:00 |
|
YunaiV
|
cd86620b74
|
REVIEW 商品管理的逻辑
|
2023-05-05 23:01:23 +08:00 |
|
puhui999
|
810c7ed040
|
完善商品管理
|
2023-05-04 01:32:25 +08:00 |
|
puhui999
|
c233ce1a20
|
合并分支修复差异
|
2023-05-03 22:18:27 +08:00 |
|
puhui999
|
70816371e5
|
初步完成商品CRUD
|
2023-05-02 02:33:14 +08:00 |
|
YunaiV
|
da162853ec
|
商城：完善购物车的逻辑
|
2023-04-30 20:32:01 +08:00 |
|
puhui999
|
24a56bb45f
|
移除ProductSku相关的status属性，修改Property
|
2023-04-30 17:34:56 +08:00 |
|
puhui999
|
4068548c45
|
移除ProductSpuSpecTypeEnum及相关引用
|
2023-04-26 17:38:42 +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
|
b30fc28021
|
商城：product：完善 ProductSpuDO 表
|
2023-04-19 10:55:43 +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
|
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 |
|
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 |
|
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
|
fe1ae23b71
|
trade：增加管理后台的订单分页接口
|
2022-12-09 00:20:38 +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
|
f6420e301e
|
修复部分单元测试报错的问题
|
2022-11-13 22:05:13 +08:00 |
|
YunaiV
|
afc76973ce
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.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/admin/spu/vo/ProductSpuRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.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/dal/dataobject/cart/TradeCartItemDO.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
# yudao-server/pom.xml
# yudao-server/src/main/resources/application-local.yaml
# yudao-server/src/main/resources/application.yaml
# yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
# yudao-ui-admin/src/views/mall/product/property/index.vue
# yudao-ui-admin/src/views/mall/product/spu/index.vue
# yudao-ui-admin/src/views/mall/product/spu/save.vue
# yudao-ui-admin/src/views/system/role/index.vue
|
2022-11-13 12:07:59 +08:00 |
|
YunaiV
|
c51ab6ad73
|
优化 Vue3 SQL 导入脚本，避免误解
|
2022-11-11 09:09:25 +08:00 |
|
YunaiV
|
84f6ec10bc
|
trade：增加优惠劵使用、商品库存的扣减
|
2022-11-10 00:32:35 +08:00 |
|
YunaiV
|
16f5d0f5a4
|
trade：增加优惠劵使用、商品库存的扣减
|
2022-11-09 23:56:00 +08:00 |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
2022-11-09 11:14:46 +08:00 |
|
luowenfeng
|
d91655f3c4
|
feature(商城): 修改单元测试
|
2022-10-27 11:00:14 +08:00 |
|