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 |