huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 23:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,584 Commits 1 Branch 0 Tags 176 MiB
4fc10eff77
Commit Graph

599 Commits

Author SHA1 Message Date
YunaiV
53e9be733f mall：review + mall：快递公司管理 2023-05-24 23:40:55 +08:00
YunaiV
3672c217f8 mall：售后分页接口的 mock 2023-05-22 00:03:11 +08:00
jason
01a67289a9 mall: 订单中心新增运费模板功能 2023-05-21 23:35:07 +08:00
YunaiV
e942b52a67 mall：订单详情：调整售后字段 2023-05-21 12:18:52 +08:00
YunaiV
e745bb6675 mall：订单列表：增加订单类型的接入 2023-05-20 11:22:43 +08:00
YunaiV
be7c664e07 mall：订单统计接口 2023-05-20 10:11:38 +08:00
YunaiV
83aa656bda mall：增加订单评论字段 2023-05-19 23:55:02 +08:00
jason
3da2eb89b2 新增快递公司功能 2023-05-18 23:37:56 +08:00
YunaiV
f129eab36f REVIEW 物流配送管理表 2023-05-16 21:41:40 +08:00
YunaiV
db73ddc942 REVIEW 物流配送管理表 2023-05-16 19:17:25 +08:00
jason
4b643a7b34 物流配送管理表结构修改 2023-05-15 23:05:39 +08:00
YunaiV
7fef594390 订单接口的梳理 2023-05-14 17:35:34 +08:00
xingyu
0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 2023-05-08 10:06:17 +08:00
芋道源码
19ceea2c6c
!472 完善商品管理（第一版） 
Merge pull request !472 from puhui999/dev
 2023-05-04 00:36:18 +00:00
puhui999
c233ce1a20 合并分支修复差异 2023-05-03 22:18:27 +08:00
YunaiV
6b05835cb3 购物车：增加获得商品数量 Map 接口 2023-05-03 09:20:17 +08:00
YunaiV
9980b12551 调整购物车接口，支持 add 商品时，适配前端可能要删除的情况 2023-05-03 00:30:02 +08:00
YunaiV
f7fe9ad7b0 1. 商城：调整购物车的失效逻辑实现，基于 SPU 是否下架 
2. 商城：增加购物车失效的重选逻辑
 2023-05-01 16:00:37 +08:00
YunaiV
da162853ec 商城：完善购物车的逻辑 2023-04-30 20:32:01 +08:00
puhui999
c3e36ba9da 修正相关问题让服务正常启动，改动位置都已加上TODO记录 2023-04-24 10:50:40 +08:00
inypeacock
d3cd87767b
缺少ServletUtils引用 
Signed-off-by: inypeacock <1300856@qq.com>
 2023-04-21 05:13:54 +00:00
YunaiV
e5fcc7a387 boot3：适合 ServletUtils 2023-04-16 21:40:56 +08:00
chop
14e7c52e0e
原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间 
原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间

Signed-off-by: chop <935048000@qq.com>
 2023-03-21 02:35:42 +00:00
YunaiV
102d56ff7d 修复单测报错的问题 2023-03-05 19:39:00 +08:00
YunaiV
53767614fe 增加商城的提示 2023-02-04 20:38:51 +08:00
YunaiV
6bf5eb0133 适配 mall 模块的 openapi 2023-02-04 13:06:54 +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
YunaiV
a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
xingyu
cacefb4eea feat: knife4j springdoc 2022-12-22 00:25:22 +08:00
YunaiV
7f131a3853 trade：增加用户 App 的订单分页和详情接口 2022-12-10 23:06:53 +08:00
YunaiV
b7d78a24a4 trade：完成管理后台的订单详情的简单对接 2022-12-10 21:02:32 +08:00
YunaiV
c5408965eb trade：增加管理后台的订单详情接口 2022-12-10 17:53:44 +08:00
YunaiV
fc48ab4928 trade：前端订单管理，联调接口 2022-12-10 17:06:34 +08:00
YunaiV
fc49f000ce trade：前端订单管理，联调接口 2022-12-10 11:52:11 +08:00
YunaiV
bddbedd781 增加城市库 2022-12-10 00:17:08 +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
YunaiV
7fc9689f07 trade：定义管理后台的订单分页接口 2022-12-08 00:07:14 +08:00
YunaiV
7056d89b0c trade：完成交易订单的收货逻辑 2022-11-29 23:02:37 +08:00
YunaiV
66abe4a84b trade：完成交易订单的发货逻辑 2022-11-27 19:42:49 +08:00
YunaiV
07f1681b50 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-26 18:41:02 +08:00
YunaiV
e96422a47e trade：完成支付成功后的回调，更新订单为已支付 2022-11-26 18:40:51 +08:00
YunaiV
1cd9085c59 pay: PayNotifyJob 增加多租户的支持 2022-11-24 23:56:13 +08:00
YunaiV
8798944069 优化 pay 支付成功后的回调逻辑 2022-11-23 21:09:16 +08:00
芋道源码
1465d064dd
!307 调用获取地址参数顺序错误 
Merge pull request !307 from plimlips/N/A
 2022-11-23 11:28:26 +00:00
YunaiV
73d847ae2e 调整支付模块的回调地址 2022-11-22 19:54:52 +08:00
YunaiV
64df5ce5f4 trade：【交易售后】增加会员取消售后 2022-11-20 23:07:14 +08:00
YunaiV
ed9c8d4a78 trade：【交易售后】增加售后日志 2022-11-20 22:54:30 +08:00
plimlips
453669c7d9
解决新建订单时,订单Id使用使用了address Id的问题 
Signed-off-by: plimlips <156839224@qq.com>
 2022-11-20 14:18:13 +00:00
plimlips
19a6fc79a2
调用获取地址参数顺序错误 
Signed-off-by: plimlips <156839224@qq.com>
 2022-11-20 12:05:18 +00:00
芋道源码
dbf237a1f3
修复 Swagger 注解错误，导致文档 404 问题 
Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>
 2022-11-20 09:28:30 +00:00
YunaiV
d884303df6 trade：【交易售后】查询分页列表 2022-11-20 09:35:06 +08:00
YunaiV
00e66216c5 trade：【交易售后】查询分页列表的前端 2022-11-20 01:05:03 +08:00
YunaiV
35528e8267 trade：【交易售后】查询分页列表 2022-11-19 20:43:59 +08:00
YunaiV
73b92190c6 trade：【交易售后】增加申请售后的单元测试 2022-11-19 14:34:59 +08:00
YunaiV
e95402ab92 trade：【交易订单】调整交易订单的 afterSale 字段 2022-11-19 09:18:19 +08:00
YunaiV
cd2bc112cc trade：【交易售后】完善发起、同意、不同意、收货、拒绝收货、退款的逻辑 2022-11-18 00:28:41 +08:00
YunaiV
ee1d362a7c trade：【交易售后】回调退款 2022-11-17 01:05:12 +08:00
YunaiV
67050eeaa8 trade：【交易售后】确认收货 2022-11-17 00:10:59 +08:00
YunaiV
40f0117130 trade：售后增加发货 2022-11-16 23:02:10 +08:00
YunaiV
92dbf093ea trade：增加管理员审批 2022-11-16 22:17:07 +08:00
YunaiV
10f2dbc8cd trade: 增加创建售后订单的接口 2022-11-16 00:51:29 +08:00
YunaiV
b8d1d31df0 trade: 调整退款单 2022-11-15 19:46:30 +08:00
YunaiV
89580e7903 合并 master 代码 2022-11-13 12:21:17 +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
f5ef87094d 优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度 2022-11-12 20:17:58 +08:00
YunaiV
5934d6b029 trade：完成下单时，创建支付单逻辑 2022-11-10 09:27:20 +08:00
YunaiV
84f6ec10bc trade：增加优惠劵使用、商品库存的扣减 2022-11-10 00:32:35 +08:00
YunaiV
734236df97 trade：创建订单接口的后端实现的单元测试 100% 2022-11-09 13:03:57 +08:00
xingyu4j
632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
YunaiV
bc2aa78f70 trade：创建订单接口的后端实现的单元测试 50% 2022-11-09 01:03:26 +08:00
YunaiV
01d10b518c trade：优化创建订单接口的后端实现 2022-11-08 22:50:03 +08:00
YunaiV
05614cc0b8 trade：完善 TradeOrderItemDO 字段 2022-11-06 23:55:59 +08:00
YunaiV
d10f49b6a7 promotion：优化价格计算的接口，增加 orderPrice 字段 2022-11-06 22:25:02 +08:00
YunaiV
e6acdf7098 将 market 模块，调整成 promotion 模块 2022-10-30 17:37:07 +08:00
YunaiV
e1d5cfe8fe 微调 trade 交易表的设计 2022-10-26 21:25:29 +08:00
YunaiV
356642ecea review 商品的 save 界面 2022-10-25 22:13:31 +08:00
YunaiV
c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
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
 2022-10-23 22:16:54 +08:00
YunaiV
a13fb61359 优化 pom.xml 文件，减少无用的多租户引用 2022-10-18 23:32:42 +08:00
zhijiantianya@gmail.com
67436ea4c6 mall: 下单的代码 review 2022-09-30 09:53:45 +00:00
ex_yang.li@ca-nio.com
9cf470df94 创建交易订单-单元测试-冲突合并 2022-09-15 17:28:08 +08:00
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
 2022-09-15 17:09:17 +08:00
ex_yang.li@ca-nio.com
5889093a64 创建交易订单-单元测试 2022-09-15 16:57:04 +08:00
YunaiV
15798cea10 mall：价格计算的 API 简单实现 2022-09-12 21:37:24 +08:00
YunaiV
67d365475c 🐛修复创建订单的流程，使用到 API Bean 未声明的报错 2022-09-10 21:41:21 +08:00
ex_yang.li@ca-nio.com
19a703b8c9 创建订单接口定义 2022-08-26 17:47:43 +08:00
YunaiV
96fc252348 mall：新增价格计算的接口 2022-08-16 09:17:46 +08:00
YunaiV
5948be86a8 mall：新增价格计算的接口 2022-08-16 08:57:18 +08:00
YunaiV
00863fdbac mall：调整 trade 订单的设计 2022-08-12 00:04:05 +08:00
YunaiV
face9cae76 mall：调整 trade 的接口 2022-08-06 19:10:28 +08:00
YunaiV
cfde3dcacb mall：优化订单表的设计 2022-08-05 00:28:40 +08:00
YunaiV
c612487198 mall：优化订单表的设计 2022-08-04 20:39:10 +08:00
YunaiV
fd4cf0c7f7 mall：优化订单表的设计 2022-08-03 23:48:56 +08:00
YunaiV
4ce76e82fc mall：完善收件地址 2022-08-01 22:49:51 +08:00
YunaiV
96e2a27d07 mall：初始化 trade 表结构 2022-08-01 00:53:16 +08:00
YunaiV
2b71a1588c mall：初始化 trade 交易模块 2022-07-31 22:36:06 +08:00