lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
4,929 Commits 2 Branches 0 Tags 165 MiB
52848d6341
Commit Graph

304 Commits

Author SHA1 Message Date
YunaiV
fe07e223e4 订单： 
1、简化交易订单的逻辑
 2023-08-18 19:28:36 +08:00
YunaiV
f217ba0807 售后： 
1、完善整个流程的实现
 2023-08-18 19:22:08 +08:00
YunaiV
5dd6e5bee8 营销： 
1. 售后订单，增加对 afterSaleId 的更新
 2023-08-17 22:32:30 +08:00
YunaiV
a159a983a2 订单： 
1. 拆分读写 OrderService，避免单 Service 逻辑过重。
 2023-08-15 21:19:13 +08:00
YunaiV
159c74ce15 订单： 
1. review 发货
2. review 拼团逻辑
 2023-08-15 21:04:20 +08:00
芋道源码
60171ce7e4
!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 
Merge pull request !571 from puhui999/feature/mall_product
 2023-08-15 12:29:51 +00:00
YunaiV
e4a2c738b2 订单： 
1. 增加查询物流接口
 2023-08-15 20:18:22 +08:00
puhui999
de828e3d04 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/controller/admin/bargain/BargainActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityCreateReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityUpdateReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityCreateReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityPageReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/product/BargainProductBaseVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityPageReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainActivityDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
 2023-08-14 21:42:11 +08:00
puhui999
651725e3e8 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 2023-08-14 21:20:03 +08:00
YunaiV
715c42574f 订单： 
1、订单评价的接入
 2023-08-13 21:44:48 +08:00
YunaiV
7dc398717a 订单： 
1、实现确认收货接口
 2023-08-13 20:27:19 +08:00
YunaiV
503c996acd 订单： 
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
 2023-08-13 20:12:24 +08:00
zhijiantianya@gmail.com
ba59ec85e0 code review 各种活动 2023-08-07 19:30:26 +08:00
puhui999
384359c9d4 fix: 完善拼团、秒杀、砍价活动管理 2023-08-06 20:21:53 +08:00
puhui999
5f9184904a fix: 完善拼团、秒杀、砍价活动管理 2023-08-06 17:46:16 +08:00
YunaiV
5e2fa48f20 code review：拼团、秒杀活动的代码 2023-08-05 20:51:48 +08:00
puhui999
92b10e2ecf Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-31 18:37:13 +08:00
puhui999
d156d43d63 fix：完善 review 拼团、秒杀活动的实现提到的问题 2023-07-31 18:34:56 +08:00
wcz
a6ffb5d650 BaseMapperX.java少了几个方法，TradeCartMapper.java方法调整，BpmProcessInstanceServiceImpl.java多了 2023-07-28 19:33:23 +08:00
YunaiV
b84f7825c5 review 拼团、秒杀活动的实现 2023-07-26 19:09:47 +08:00
puhui999
7957cfa50d fix：优化拼团与订单集成逻辑 2023-07-24 17:29:51 +08:00
puhui999
8d13ecc9c8 fix：优化订单发货逻辑使其支持一单分发 2023-07-24 15:14:16 +08:00
puhui999
f23e1b857a fix：合并差异修正 2023-07-21 16:54:58 +08:00
puhui999
a73e078593 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
 2023-07-21 16:53:36 +08:00
puhui999
259807600a feat：拼团订单集成 2023-07-21 16:47:04 +08:00
zhijiantianya@gmail.com
3f410c2735 by gateway: 
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
 2023-07-18 20:21:25 +08:00
puhui999
d80bf5a368 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-18 09:06:02 +08:00
YunaiV
6f475f8c85 mall + pay： 
1. 优化 PayClient 支付逻辑，返回业务失败 errorCode + errorMsg 错误码
 2023-07-18 07:37:03 +08:00
puhui999
927f71c7e2 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-14 14:28:26 +08:00
YunaiV
ca4afc2909 mall + pay： 
1. 调整 cashier 的 channels 的读取实现方式
 2023-07-10 18:28:43 +08:00
YunaiV
2485a5ebc9 mall + pay： 
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
 2023-07-10 17:35:26 +08:00
puhui999
e7d8643665 fix：修复 mall review @puhui999 2023-07-10 16:35:49 +08:00
chenchen
284506b356 mall 下单日志 2023-07-07 14:06:56 +08:00
chenchen
f492797fba update 售后日志 2023-07-07 14:06:56 +08:00
chenchen
2865c28a9f 售后日志优化，map->抽方法 2023-07-07 14:06:56 +08:00
chenchen
75afab1f86 售后日志优化 2023-07-07 14:06:56 +08:00
YunaiV
20eb0a2a88 mall + pay： 
1、调整 returnUrl 的实现
 2023-07-04 23:43:16 +08:00
YunaiV
9b90320985 mall + trade： 
1、增加配送信息
 2023-07-02 12:55:15 +08:00
YunaiV
6fc724545b mall + trade： 
1、取消订单 mock 接口
2、删除订单 mock 接口
 2023-07-02 00:15:28 +08:00
YunaiV
6206dd94e2 mall + trade： 
1、获取订单结算信息，增加门店自提编号
 2023-07-01 00:26:09 +08:00
YunaiV
3750dc76c7 mall + trade： 
1、获取订单结算信息，增加积分的 mock 返回
 2023-06-30 22:45:03 +08:00
YunaiV
ef656cf762 mall + promotion： 
1、增加获得符合条件的优惠劵
 2023-06-29 20:20:00 +08:00
YunaiV
b3c1be108c mall + trade： 
1、增加门店自提的 mock 接口
 2023-06-29 00:24:45 +08:00
YunaiV
1dfbe45913 mall + order：review 售后日志 2023-06-23 21:50:57 +08:00
YunaiV
07884ef423 Merge branch 'mall_trade_aftersalelog' of https://gitee.com/chen934298133/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java
 2023-06-23 21:37:21 +08:00
YunaiV
bc54e2fb35 mall + order：订单详情 2023-06-23 21:34:30 +08:00
芋道源码
b92ed60136
!519 订单详情后端修改 
Merge pull request !519 from 矿泉水/feature/mall_product
 2023-06-23 13:30:53 +00:00
YunaiV
2efdbf93cb mall + promotion：review 秒杀、评论代码 2023-06-23 21:14:36 +08:00
puhui999
666925da6e fix：mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED 2023-06-21 08:41:45 +08:00
puhui999
700d95a43d fix：完善商品评论 review 提到的问题 2023-06-20 18:12:39 +08:00
chenchen
2f0aaee823 售后日志优化 2023-06-19 17:04:07 +08:00
xiaobai
32b348a2d3 Merge branch 'feature/mall_product' of https://gitee.com/joly_xiaobai/ruoyi-vue-pro into mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
 2023-06-19 13:06:00 +08:00
xiaobai
6b3af71735 订单详情修改20230619 2023-06-19 12:50:28 +08:00
chenchen
b7c0fef63f Merge branch 'feature/mall_product' into mall_product_aftersalelog 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
#	yudao-server/pom.xml
 2023-06-19 10:22:05 +08:00
chenchen
a93b9a616f 售后日志优化 2023-06-19 10:19:29 +08:00
YunaiV
fc570b6062 mall + promotion：完善秒杀活动的 mock 返回 2023-06-18 21:23:50 +08:00
YunaiV
6573849f56 mall + promotion：mock 拼团列表 2023-06-18 00:35:22 +08:00
chenchen
7d0e9ea762 fix 依赖启动问题 2023-06-17 23:47:38 +08:00
YunaiV
60b24e36d5 code review：售后日志逻辑 2023-06-17 22:15:03 +08:00
陈賝
59e16795be !514 mall交易日志封装 
* 交易日志封装
* 交易日志封装
* 交易日志模块
 2023-06-17 14:00:10 +00:00
YunaiV
35df912be7 code review：商品评价哈 2023-06-17 21:57:52 +08:00
芋道源码
08535d6019
!509 完善商品评论 
Merge pull request !509 from puhui999/feature/mall_product
 2023-06-17 13:39:35 +00:00
YunaiV
0d47d6cead mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉 2023-06-17 11:59:38 +08:00
YunaiV
59d5fef592 mall + trade：优化运费模版的代码 2023-06-17 11:35:31 +08:00
YunaiV
8ec3733882 mall + trade：mock 拼团记录列表的接口 2023-06-16 20:32:03 +08:00
jason
1662d17fc9 快递客户端 review 修改 2023-06-15 14:59:31 +08:00
jason
e69e6d880b 快递价格计算 review 修改 2023-06-15 10:49:24 +08:00
xingyu
e23fb5024a fix: required = true 已过期 2023-06-14 15:21:41 +08:00
xingyu
573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.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/spu/vo/ProductSpuBaseVO.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-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
 2023-06-14 15:18:12 +08:00
puhui999
60172274ec fix：合并代码后修改差异完善商品评论相关 2023-06-12 17:02:46 +08:00
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
20100aa78b fix：完善商品评论 2023-06-12 12:08:55 +08:00
YunaiV
dcb1660880 mall + trade：code review 快递计算逻辑 2023-06-12 00:20:20 +08:00
YunaiV
e1a8e45ac7 mall + trade：快递价格计算 2023-06-11 23:40:38 +08:00
jason
644d976a78 快递100 快递查询实现 2023-06-11 18:15:33 +08:00
jason
45e5578cb4 快递查询、 通过快递鸟查询实现 2023-06-11 10:22:33 +08:00
YunaiV
5ffc1ac9f3 mall + promotion：增加秒杀活动的 mock 接口 2023-06-11 00:22:45 +08:00
jason
dde89d51d5 物流运费计算 review 修改 + 单元测试 2023-06-10 00:15:57 +08:00
YunaiV
25bea4920c mall + trade：review 物流计算 2023-06-09 19:17:25 +08:00
YunaiV
f2d803c111 mall + product：review 评论接口 2023-06-09 13:59:04 +08:00
puhui999
5bfca56efa fix：完善 TODO 提到的问题 2023-06-07 18:08:49 +08:00
puhui999
db7e47faa2 fix：完善 TODO 提到的问题 2023-06-07 14:15:25 +08:00
jason
36c45bd44e review 价格运算修改. 2023-06-04 17:45:40 +08:00
YunaiV
dd93215139 mall + trade：review 商品管理 2023-06-03 22:59:34 +08:00
puhui999
f3a982da31 fix：修复合并差异 2023-06-03 21:12:12 +08:00
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
 2023-06-03 20:55:45 +08:00
YunaiV
910d374cee mall + trade：review 运费价格计算 2023-06-03 19:56:23 +08:00
YunaiV
36ce968893 mall + trade：review 运费价格计算 2023-06-03 18:08:59 +08:00
jason
f1fa8eadd2 mall - trade - 新增 TradeDeliveryPriceCalculator 2023-06-03 17:16:18 +08:00
YunaiV
73a781cbbe mall + trade：增加 TradeRewardActivityPriceCalculatorTest 的单元测试 2023-06-03 13:36:07 +08:00
YunaiV
0d08c814ec mall + trade：增加 TradeDiscountActivityPriceCalculator 的单元测试 2023-06-03 13:14:47 +08:00
YunaiV
1452f6b231 mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试 2023-06-03 11:53:40 +08:00
YunaiV
636b14ccce mall + trade：创建订单逻辑，接入新的价格接口 2023-06-03 09:14:51 +08:00
YunaiV
2a9a869e01 mall + trade：获得订单结算信息，接入支付接口 2023-06-03 00:46:56 +08:00
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
 2023-06-01 11:44:16 +08:00
YunaiV
5de8fa2e42 mall + trade：解决报错问题 2023-05-31 21:17:35 +08:00
puhui999
e86214015d fix: 完善商品管理 2023-05-31 16:39:43 +08:00
YunaiV
e34eddc386 mall + trade：review 自提代码 2023-05-31 09:18:24 +08:00
jason
894b19b8ec 新增自提门店管理 2023-05-30 21:18:30 +08:00
jason
f8db53896f review 修改 2023-05-30 21:17:51 +08:00
puhui999
35daee84e7 fix: 解决合并代码后项目运行失败的问题，相关问题已标注 TODO 2023-05-30 10:26:42 +08:00
YunaiV
0631c51d93 mall + trade：review 配置管理列表 2023-05-28 23:16:11 +08:00
jason
55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 2023-05-27 11:20:43 +08:00
YunaiV
02fa6fc5c6 mall + trade：调整价格字段，更易懂 2023-05-26 23:58:26 +08:00
YunaiV
0083d12404 mall：review + mall：快递费用 2023-05-25 22:51:38 +08:00
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