puhui999
|
20100aa78b
|
fix：完善商品评论
|
3 years ago |
YunaiV
|
dcb1660880
|
mall + trade：code review 快递计算逻辑
|
3 years ago |
|
YunaiV
|
e1a8e45ac7
|
mall + trade：快递价格计算
|
3 years ago |
|
YunaiV
|
0c283ded5d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
b6c7a940be
|
mall + promotion：增加秒杀活动的 mock 接口
|
3 years ago |
jason
|
644d976a78
|
快递100 快递查询实现
|
3 years ago |
|
jason
|
45e5578cb4
|
快递查询、 通过快递鸟查询实现
|
3 years ago |
|
YunaiV
|
5ffc1ac9f3
|
mall + promotion：增加秒杀活动的 mock 接口
|
3 years ago |
|
YunaiV
|
4f5ac0edbb
|
mall + promotion：增加营销活动的 mock 接口
|
3 years ago |
|
YunaiV
|
9e894e0430
|
mall + promotion：增加优惠劵的 mock 接口
|
3 years ago |
|
YunaiV
|
66210e5ee2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
bb8e44a268
|
mall + product：增加评论 mock 逻辑
|
3 years ago |
|
jason
|
dde89d51d5
|
物流运费计算 review 修改 + 单元测试
|
3 years ago |
|
YunaiV
|
1e1a22c256
|
mall + product：评论的 review
|
3 years ago |
|
YunaiV
|
84b365a707
|
mall + product：简化收藏逻辑，去掉 type 字段
|
3 years ago |
|
YunaiV
|
25bea4920c
|
mall + trade：review 物流计算
|
3 years ago |
|
YunaiV
|
f2d803c111
|
mall + product：review 评论接口
|
3 years ago |
|
YunaiV
|
4126e37d91
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/pom.xml
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
|
3 years ago |
|
YunaiV
|
f75f4e8846
|
mall + product：完善商品详情接口
|
3 years ago |
|
puhui999
|
91e357e59d
|
fix：移动 app 商品评论分页相关常量到 AppCommentPageReqVO 中
|
3 years ago |
|
puhui999
|
8f7efbe4e2
|
fix：测试 app 商品评论页获取评论分页接口和相关评论分类数量接口，修复测试时发现的问题
|
3 years ago |
|
puhui999
|
151e58daa1
|
fix：完善 app 商品评论页获取评论分页接口和相关评论分类数量接口
|
3 years ago |
|
puhui999
|
5bfca56efa
|
fix：完善 TODO 提到的问题
|
3 years ago |
|
puhui999
|
db7e47faa2
|
fix：完善 TODO 提到的问题
|
3 years ago |
|
jason
|
36c45bd44e
|
review 价格运算修改.
|
3 years ago |
|
YunaiV
|
dd93215139
|
mall + trade：review 商品管理
|
3 years ago |
|
puhui999
|
f3a982da31
|
fix：修复合并差异
|
3 years ago |
|
puhui999
|
ba380ea615
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/price/PriceServiceTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
|
3 years ago |
|
YunaiV
|
910d374cee
|
mall + trade：review 运费价格计算
|
3 years ago |
|
YunaiV
|
36ce968893
|
mall + trade：review 运费价格计算
|
3 years ago |
|
jason
|
f1fa8eadd2
|
mall - trade - 新增 TradeDeliveryPriceCalculator
|
3 years ago |
|
YunaiV
|
73a781cbbe
|
mall + trade：增加 TradeRewardActivityPriceCalculatorTest 的单元测试
|
3 years ago |
|
YunaiV
|
0d08c814ec
|
mall + trade：增加 TradeDiscountActivityPriceCalculator 的单元测试
|
3 years ago |
|
YunaiV
|
1452f6b231
|
mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试
|
3 years ago |
|
YunaiV
|
636b14ccce
|
mall + trade：创建订单逻辑，接入新的价格接口
|
3 years ago |
|
YunaiV
|
2a9a869e01
|
mall + trade：获得订单结算信息，接入支付接口
|
3 years ago |
|
puhui999
|
e41935ea1d
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/price/PriceApiImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateSimpleRespVO.java
|
3 years ago |
|
puhui999
|
8d2bcc57aa
|
fix: 完善商品管理
|
3 years ago |
|
YunaiV
|
5de8fa2e42
|
mall + trade：解决报错问题
|
3 years ago |
|
puhui999
|
e86214015d
|
fix: 完善商品管理
|
3 years ago |
|
YunaiV
|
e34eddc386
|
mall + trade：review 自提代码
|
3 years ago |
|
jason
|
894b19b8ec
|
新增自提门店管理
|
3 years ago |
|
jason
|
f8db53896f
|
review 修改
|
3 years ago |
|
puhui999
|
35daee84e7
|
fix: 解决合并代码后项目运行失败的问题，相关问题已标注 TODO
|
3 years ago |
|
puhui999
|
fcaa92d406
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
0631c51d93
|
mall + trade：review 配置管理列表
|
3 years ago |
|
jason
|
55dbff7570
|
运费模板 review 修改. 运费模块可以选择多个区域
|
3 years ago |
|
YunaiV
|
02fa6fc5c6
|
mall + trade：调整价格字段，更易懂
|
3 years ago |
|
YunaiV
|
0083d12404
|
mall：review + mall：快递费用
|
3 years ago |
|
puhui999
|
b065a2a741
|
fix:修复商品 review 提到的问题
|
3 years ago |
|
YunaiV
|
53e9be733f
|
mall：review + mall：快递公司管理
|
3 years ago |
|
YunaiV
|
c62da6a056
|
mall：review 商品接口
|
3 years ago |
|
puhui999
|
a70c7ca855
|
fix:完善 mall.sql
|
3 years ago |
|
puhui999
|
d08b9530a2
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/optional/mall.sql
|
3 years ago |
|
puhui999
|
cac5545762
|
fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试
|
3 years ago |
|
YunaiV
|
3672c217f8
|
mall：售后分页接口的 mock
|
3 years ago |
|
芋道源码
|
7bfb426a9d
|
!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
Merge pull request !484 from Rundeepin/feature/mall_product
|
3 years ago |
|
jason
|
01a67289a9
|
mall: 订单中心新增运费模板功能
|
3 years ago |
|
YunaiV
|
e942b52a67
|
mall：订单详情：调整售后字段
|
3 years ago |
|
YunaiV
|
e745bb6675
|
mall：订单列表：增加订单类型的接入
|
3 years ago |
|
YunaiV
|
be7c664e07
|
mall：订单统计接口
|
3 years ago |
|
YunaiV
|
83aa656bda
|
mall：增加订单评论字段
|
3 years ago |
崔家辉
|
fbeaa06100
|
bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
|
3 years ago |
|
jason
|
3da2eb89b2
|
新增快递公司功能
|
3 years ago |
|
YunaiV
|
f129eab36f
|
REVIEW 物流配送管理表
|
3 years ago |
|
YunaiV
|
db73ddc942
|
REVIEW 物流配送管理表
|
3 years ago |
|
YunaiV
|
8ed52701fd
|
调整商品收藏的命名
|
3 years ago |
|
jason
|
4b643a7b34
|
物流配送管理表结构修改
|
3 years ago |
|
jason
|
7a792a7d48
|
商品收藏相关修改
|
3 years ago |
|
YunaiV
|
7fef594390
|
订单接口的梳理
|
3 years ago |
|
YunaiV
|
c21e88860f
|
REVIEW 物流管理相关的表
|
3 years ago |
|
YunaiV
|
467811a42e
|
REVIEW 商品收藏的逻辑 v2
|
3 years ago |
|
jason
|
0ffa7ff4c8
|
发货配送模块表结构
|
3 years ago |
xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
3 years ago |
|
jason
|
14d02bdfb3
|
商品收藏修改
|
3 years ago |
|
YunaiV
|
96e2bf020f
|
REVIEW 商品收藏的逻辑
|
3 years ago |
|
YunaiV
|
cd86620b74
|
REVIEW 商品管理的逻辑
|
3 years ago |
|
jason
|
7345d80b53
|
新增商品收藏功能
|
3 years ago |
|
芋道源码
|
19ceea2c6c
|
!472 完善商品管理（第一版）
Merge pull request !472 from puhui999/dev
|
3 years ago |
|
puhui999
|
810c7ed040
|
完善商品管理
|
3 years ago |
|
puhui999
|
c233ce1a20
|
合并分支修复差异
|
3 years ago |
|
YunaiV
|
6b05835cb3
|
购物车：增加获得商品数量 Map 接口
|
3 years ago |
|
puhui999
|
e163ae8b70
|
完成商品保存和编辑数据回显
|
3 years ago |
|
YunaiV
|
9980b12551
|
调整购物车接口，支持 add 商品时，适配前端可能要删除的情况
|
3 years ago |
|
puhui999
|
70816371e5
|
初步完成商品CRUD
|
3 years ago |
|
YunaiV
|
f7fe9ad7b0
|
1. 商城：调整购物车的失效逻辑实现，基于 SPU 是否下架
2. 商城：增加购物车失效的重选逻辑
|
3 years ago |
|
puhui999
|
6428f0fcaf
|
添加商品枚举
|
3 years ago |
|
YunaiV
|
da162853ec
|
商城：完善购物车的逻辑
|
3 years ago |
|
puhui999
|
15ced47b17
|
添加多租户
|
3 years ago |
|
puhui999
|
c10ea9d9de
|
移除ProductSku相关的status属性，修改Property
|
3 years ago |
|
puhui999
|
24a56bb45f
|
移除ProductSku相关的status属性，修改Property
|
3 years ago |
|
puhui999
|
f56d394830
|
修改ProductSpuBaseVO第一版
|
3 years ago |
|
puhui999
|
668d493b7f
|
Product相关Do添加TenantBaseDO
|
3 years ago |
|
YunaiV
|
2113e825d7
|
完善 App 商品详情逻辑的 10%
|
3 years ago |
|
YunaiV
|
3ced6a3240
|
完善 App 商品搜索的逻辑
|
3 years ago |
|
puhui999
|
4068548c45
|
移除ProductSpuSpecTypeEnum及相关引用
|
3 years ago |
|
YunaiV
|
a5f018104e
|
调整商品分类的实现
|
3 years ago |
|
puhui999
|
c3e36ba9da
|
修正相关问题让服务正常启动，改动位置都已加上TODO记录
|
3 years ago |
|
puhui999
|
6786aa352b
|
修正DO对齐数据库表字段，VO对齐前端
|
3 years ago |
|
芋道源码
|
dd46e9b107
|
!461 缺少ServletUtils引用
Merge pull request !461 from inypeacock/N/A
|
3 years ago |
|
芋道源码
|
a2ca746f0a
|
!459 新建商品时商品分类状态判断错误
Merge pull request !459 from LiZhongShi/master
|
3 years ago |
inypeacock
|
d3cd87767b
|
缺少ServletUtils引用
Signed-off-by: inypeacock <1300856@qq.com>
|
3 years ago |
|
YunaiV
|
502fa11f1d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
3 years ago |
|
YunaiV
|
32da5aae84
|
商城：product：完善 ProductSpuDO 表
|
3 years ago |
|
YunaiV
|
63542b4ccb
|
商城：product：完善 ProductSkuDO 表
|
3 years ago |
|
YunaiV
|
b30fc28021
|
商城：product：完善 ProductSpuDO 表
|
3 years ago |
lizs
|
d5a48e63a3
|
fix: 新建商品时商品分类状态判断错误
|
3 years ago |
|
YunaiV
|
e5fcc7a387
|
boot3：适合 ServletUtils
|
3 years ago |
wangzhs
|
38d7d75f7f
|
[新增][商品评价]管理后台/APP端
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
|
3 years ago |
|
wangzhs
|
6fe5f4bc0d
|
[新增][商品评价]管理后台/APP端
|
3 years ago |
chop
|
14e7c52e0e
|
原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间
原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间
Signed-off-by: chop <935048000@qq.com>
|
3 years ago |
|
wangzhs
|
cbf5ef5953
|
[新增][商品评价]管理后台
1. 显示 / 隐藏评论
2. 商家回复
|
3 years ago |
|
wangzhs
|
da53a041da
|
[新增][商品评价]管理后台分页查询
|
3 years ago |
|
wangzhs
|
f69d8503a2
|
[新增][商品评价]
1. 实体类
2. h2.sql
|
3 years ago |
|
wangzhs
|
b0c73b786a
|
[测试][商品分类]测试创建商品分类
|
3 years ago |
|
wangzhs
|
5674bfafc8
|
[修改][商品分类]分类只能存在2级
|
3 years ago |
|
wangzhs
|
b89d7ff384
|
[修改][商品分类]
1. 删除 description 分类描述字段
2. 新增big_pic_url PC端分类图字段
|
3 years ago |
|
wangzhs
|
4a01348e0b
|
[新增][商品分类] 列表查询筛选增加 status、parentId 字段
|
3 years ago |
|
YunaiV
|
102d56ff7d
|
修复单测报错的问题
|
3 years ago |
|
YunaiV
|
53767614fe
|
增加商城的提示
|
3 years ago |
|
YunaiV
|
6bf5eb0133
|
适配 mall 模块的 openapi
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
711a39b8e9
|
spring doc：增加模块分组
|
3 years ago |
|
xingyu
|
854ba3315c
|
marge master
|
3 years ago |
|
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
|
3 years ago |
dengxiaobing
|
df2c137fe2
|
清理单元测试 sql 脚本
|
3 years ago |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
7a4a6a3046
|
product：优化管理后台相关的接口
area：增加地区列表界面
|
3 years ago |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
3 years ago |
|
YunaiV
|
92dde0b48b
|
product：优化更新 SKU 的代码
|
3 years ago |
|
YunaiV
|
d453301455
|
product：完善 App 商品分页接口
|
3 years ago |
|
YunaiV
|
652428a723
|
product：完善 App 商品详情接口
|
3 years ago |
|
YunaiV
|
2f9eef589b
|
product：优化商品分类的代码
|
3 years ago |
|
芋道源码
|
f9b4874ee9
|
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
|
3 years ago |
|
YunaiV
|
4a2cb33cd7
|
product：优化商品属性值的代码
|
3 years ago |
|
YunaiV
|
98ca807d4b
|
product：优化商品属性项的代码
|
3 years ago |
|
YunaiV
|
7f131a3853
|
trade：增加用户 App 的订单分页和详情接口
|
3 years ago |
|
YunaiV
|
b7d78a24a4
|
trade：完成管理后台的订单详情的简单对接
|
3 years ago |
|
YunaiV
|
c5408965eb
|
trade：增加管理后台的订单详情接口
|
3 years ago |
|
YunaiV
|
fc48ab4928
|
trade：前端订单管理，联调接口
|
3 years ago |
|
YunaiV
|
fc49f000ce
|
trade：前端订单管理，联调接口
|
3 years ago |
|
YunaiV
|
bddbedd781
|
增加城市库
|
3 years ago |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
3 years ago |
|
YunaiV
|
fe1ae23b71
|
trade：增加管理后台的订单分页接口
|
3 years ago |
|
YunaiV
|
fac3e7c726
|
product：商品规格，调整成商品属性，避免和 sku 概念冲突
|
3 years ago |
|
YunaiV
|
7fc9689f07
|
trade：定义管理后台的订单分页接口
|
3 years ago |
halfninety
|
9384ba0d52
|
秒杀相关VO添加example
|
3 years ago |
|
halfninety
|
6808d3c163
|
完成秒杀时段todo，秒杀时段商品添加timeIds
|
3 years ago |
|
halfninety
|
abbb076859
|
完成秒杀时段，秒杀活动相关todo
|
3 years ago |
|
YunaiV
|
0b9ddddd18
|
promotion：code review 秒杀的代码
|
3 years ago |
|
halfninety
|
fc3245a06b
|
修改秒杀相关文件地址
|
3 years ago |
|
halfninety
|
54baad165d
|
秒杀时段新增修改时间段冲突校验。
秒杀活动新增，修改，删除时对秒杀时段的秒杀活动数量进行修改
|
3 years ago |
|
halfninety
|
7bc1ae5f35
|
秒杀活动增删改查
|
3 years ago |
|
halfninety
|
cd62c4d220
|
秒杀时段相关
|
3 years ago |
|
halfninety
|
ea2a57f0a0
|
修改秒杀时段id
|
3 years ago |
|
halfninety
|
83ee1c6129
|
秒杀活动，添加商品，分页查询
|
3 years ago |
|
YunaiV
|
7056d89b0c
|
trade：完成交易订单的收货逻辑
|
3 years ago |
|
YunaiV
|
66abe4a84b
|
trade：完成交易订单的发货逻辑
|
3 years ago |
|
YunaiV
|
07f1681b50
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
|
YunaiV
|
e96422a47e
|
trade：完成支付成功后的回调，更新订单为已支付
|
3 years ago |
|
YunaiV
|
1cd9085c59
|
pay: PayNotifyJob 增加多租户的支持
|
3 years ago |
|
xingyu
|
61a6039fce
|
Merge remote-tracking branch 'origin/master' into feature/vue3
|
3 years ago |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
3 years ago |
|
YunaiV
|
8798944069
|
优化 pay 支付成功后的回调逻辑
|
3 years ago |
|
芋道源码
|
1465d064dd
|
!307 调用获取地址参数顺序错误
Merge pull request !307 from plimlips/N/A
|
3 years ago |
|
YunaiV
|
73d847ae2e
|
调整支付模块的回调地址
|
3 years ago |
|
YunaiV
|
64df5ce5f4
|
trade：【交易售后】增加会员取消售后
|
3 years ago |
|
YunaiV
|
ed9c8d4a78
|
trade：【交易售后】增加售后日志
|
3 years ago |
plimlips
|
453669c7d9
|
解决新建订单时,订单Id使用使用了address Id的问题
Signed-off-by: plimlips <156839224@qq.com>
|
3 years ago |
|
plimlips
|
19a6fc79a2
|
调用获取地址参数顺序错误
Signed-off-by: plimlips <156839224@qq.com>
|
3 years ago |
|
芋道源码
|
dbf237a1f3
|
修复 Swagger 注解错误，导致文档 404 问题
Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>
|
3 years ago |
|
YunaiV
|
d884303df6
|
trade：【交易售后】查询分页列表
|
3 years ago |
|
YunaiV
|
00e66216c5
|
trade：【交易售后】查询分页列表的前端
|
3 years ago |
|
YunaiV
|
35528e8267
|
trade：【交易售后】查询分页列表
|
3 years ago |
|
YunaiV
|
73b92190c6
|
trade：【交易售后】增加申请售后的单元测试
|
3 years ago |
|
YunaiV
|
af71a19241
|
trade：【商品】sku 表增加 spu_name 字段，冗余
|
3 years ago |
|
YunaiV
|
e95402ab92
|
trade：【交易订单】调整交易订单的 afterSale 字段
|
3 years ago |
|
YunaiV
|
cd2bc112cc
|
trade：【交易售后】完善发起、同意、不同意、收货、拒绝收货、退款的逻辑
|
3 years ago |
|
YunaiV
|
ee1d362a7c
|
trade：【交易售后】回调退款
|
3 years ago |
|
YunaiV
|
67050eeaa8
|
trade：【交易售后】确认收货
|
3 years ago |
|
YunaiV
|
40f0117130
|
trade：售后增加发货
|
3 years ago |
|
YunaiV
|
92dbf093ea
|
trade：增加管理员审批
|
3 years ago |
|
YunaiV
|
10f2dbc8cd
|
trade: 增加创建售后订单的接口
|
3 years ago |
|
YunaiV
|
b8d1d31df0
|
trade: 调整退款单
|
3 years ago |
|
YunaiV
|
f6420e301e
|
修复部分单元测试报错的问题
|
3 years ago |
|
YunaiV
|
38f67d4130
|
将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中
|
3 years ago |
|
YunaiV
|
12d045ea58
|
修复部分单元测试报错的问题
|
3 years ago |
|
YunaiV
|
89580e7903
|
合并 master 代码
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
f5ef87094d
|
优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度
|
3 years ago |
|
YunaiV
|
c51ab6ad73
|
优化 Vue3 SQL 导入脚本，避免误解
|
3 years ago |
|
YunaiV
|
5934d6b029
|
trade：完成下单时，创建支付单逻辑
|
3 years ago |
|
YunaiV
|
84f6ec10bc
|
trade：增加优惠劵使用、商品库存的扣减
|
3 years ago |
|
YunaiV
|
16f5d0f5a4
|
trade：增加优惠劵使用、商品库存的扣减
|
3 years ago |
|
YunaiV
|
734236df97
|
trade：创建订单接口的后端实现的单元测试 100%
|
3 years ago |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
3 years ago |
|
YunaiV
|
bc2aa78f70
|
trade：创建订单接口的后端实现的单元测试 50%
|
3 years ago |
|
YunaiV
|
01d10b518c
|
trade：优化创建订单接口的后端实现
|
3 years ago |
|
YunaiV
|
d7a1c8f7ca
|
promotion：增加获得优惠劵匹配结果的列表的单元测试
|
3 years ago |