YunaiV
|
102d56ff7d
|
修复单测报错的问题
|
3 years ago |
|
YunaiV
|
53767614fe
|
增加商城的提示
|
3 years ago |
|
YunaiV
|
6bf5eb0133
|
适配 mall 模块的 openapi
|
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 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
3 years ago |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
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 |
|
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 |
|
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
|
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
|
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
|
5934d6b029
|
trade：完成下单时，创建支付单逻辑
|
3 years ago |
|
YunaiV
|
84f6ec10bc
|
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
|
05614cc0b8
|
trade：完善 TradeOrderItemDO 字段
|
3 years ago |
|
YunaiV
|
d10f49b6a7
|
promotion：优化价格计算的接口，增加 orderPrice 字段
|
3 years ago |
|
YunaiV
|
e6acdf7098
|
将 market 模块，调整成 promotion 模块
|
3 years ago |
|
YunaiV
|
e1d5cfe8fe
|
微调 trade 交易表的设计
|
3 years ago |
|
YunaiV
|
356642ecea
|
review 商品的 save 界面
|
3 years ago |
|
YunaiV
|
c00ded3ed3
|
优化商品的 index 界面
|
3 years ago |
|
YunaiV
|
2bd2cb56a1
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
yudao-module-mall/yudao-module-trade-biz/pom.xml
|
3 years ago |
|
YunaiV
|
a13fb61359
|
优化 pom.xml 文件，减少无用的多租户引用
|
3 years ago |
|
zhijiantianya@gmail.com
|
67436ea4c6
|
mall: 下单的代码 review
|
4 years ago |
ex_yang.li@ca-nio.com
|
9cf470df94
|
创建交易订单-单元测试-冲突合并
|
4 years ago |
|
ex_yang.li@ca-nio.com
|
f21ce954ec
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp
# Conflicts:
# yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
# yudao-server/src/main/resources/application.yaml
|
4 years ago |
|
ex_yang.li@ca-nio.com
|
5889093a64
|
创建交易订单-单元测试
|
4 years ago |
|
YunaiV
|
15798cea10
|
mall：价格计算的 API 简单实现
|
4 years ago |
|
YunaiV
|
67d365475c
|
🐛修复创建订单的流程，使用到 API Bean 未声明的报错
|
4 years ago |
|
ex_yang.li@ca-nio.com
|
19a703b8c9
|
创建订单接口定义
|
4 years ago |
|
YunaiV
|
96fc252348
|
mall：新增价格计算的接口
|
4 years ago |
|
YunaiV
|
5948be86a8
|
mall：新增价格计算的接口
|
4 years ago |
|
YunaiV
|
00863fdbac
|
mall：调整 trade 订单的设计
|
4 years ago |
|
YunaiV
|
face9cae76
|
mall：调整 trade 的接口
|
4 years ago |
|
YunaiV
|
cfde3dcacb
|
mall：优化订单表的设计
|
4 years ago |
|
YunaiV
|
c612487198
|
mall：优化订单表的设计
|
4 years ago |
|
YunaiV
|
fd4cf0c7f7
|
mall：优化订单表的设计
|
4 years ago |
|
YunaiV
|
4ce76e82fc
|
mall：完善收件地址
|
4 years ago |
|
YunaiV
|
96e2a27d07
|
mall：初始化 trade 表结构
|
4 years ago |
|
YunaiV
|
2b71a1588c
|
mall：初始化 trade 交易模块
|
4 years ago |