p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,191 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

4191 Commits

Author SHA1 Message Date
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
YunaiV 0c283ded5d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-11 23:19:09 +08:00
YunaiV b6c7a940be mall + promotion：增加秒杀活动的 mock 接口 2023-06-11 23:19:04 +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
YunaiV 4f5ac0edbb mall + promotion：增加营销活动的 mock 接口 2023-06-10 17:51:15 +08:00
YunaiV 9e894e0430 mall + promotion：增加优惠劵的 mock 接口 2023-06-10 09:57:37 +08:00
YunaiV 66210e5ee2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-10 00:19:08 +08:00
YunaiV bb8e44a268 mall + product：增加评论 mock 逻辑 2023-06-10 00:17:22 +08:00
jason dde89d51d5 物流运费计算 review 修改 + 单元测试 2023-06-10 00:15:57 +08:00
YunaiV 1e1a22c256 mall + product：评论的 review 2023-06-09 22:41:16 +08:00
YunaiV 84b365a707 mall + product：简化收藏逻辑，去掉 type 字段 2023-06-09 20:44:00 +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
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
 2023-06-09 08:55:45 +08:00
YunaiV f75f4e8846 mall + product：完善商品详情接口 2023-06-09 08:54:33 +08:00
芋道源码 0e817b190f
!499 完善商品管理 review 提到的问题 
Merge pull request !499 from puhui999/feature/mall_product
 2023-06-09 00:53:44 +00:00
puhui999 91e357e59d fix：移动 app 商品评论分页相关常量到 AppCommentPageReqVO 中 2023-06-08 17:15:37 +08:00
puhui999 8f7efbe4e2 fix：测试 app 商品评论页获取评论分页接口和相关评论分类数量接口，修复测试时发现的问题 2023-06-08 16:14:23 +08:00
puhui999 151e58daa1 fix：完善 app 商品评论页获取评论分页接口和相关评论分类数量接口 2023-06-08 11:37:49 +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
芋道源码 e72f741d02
!493 完善善品管理 
Merge pull request !493 from puhui999/feature/mall_product
 2023-06-03 14:35:23 +00: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
puhui999 8d2bcc57aa fix: 完善商品管理 2023-06-01 11:41:26 +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
puhui999 fcaa92d406 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-05-30 09:46:31 +08:00
YunaiV 6bdc31a315 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-28 23:16:18 +08:00
YunaiV 0631c51d93 mall + trade：review 配置管理列表 2023-05-28 23:16:11 +08:00
YunaiV 6a9146ff8d mall + trade：调整价格计算的逻辑 2023-05-28 20:09:51 +08:00
jason 55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 2023-05-27 11:20:43 +08:00