szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,460 Commits 13 Branches 41 Tags 242 MiB
Commit Graph

181 Commits

Author SHA1 Message Date
芋道源码 a76760c419
!653 完善拼团活动下单流程 
Merge pull request !653 from puhui999/feature/mall_product
 2023-10-06 02:20:21 +00:00
YunaiV 8e7b295d24 trade：砍价记录的详情 100% 2023-10-06 10:17:41 +08:00
puhui999 92da91a7dc 订单：修改订单收货地址添加日志记录 2023-10-06 01:32:57 +08:00
YunaiV 1bda3c8b53 promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！ 2023-10-05 17:22:17 +08:00
owen 7a15b340b0 交易：核销 2023-10-04 10:51:36 +08:00
owen 60ea719b46 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
 2023-10-04 09:12:48 +08:00
YunaiV dc1347184f code review：拼团、砍价活动 2023-10-04 00:47:17 +08:00
YunaiV 20f5834d9a trade：价格计算时，接入优惠劵逻辑 2023-10-04 00:30:03 +08:00
owen a9e822762d 统计：交易统计定时任务 2023-10-03 21:21:11 +08:00
YunaiV df4716d5a1 code review：分销 2023-10-03 10:23:40 +08:00
owen b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-02 23:52:25 +08:00
owen d0f0bc5888 分销：调整推广人列表查询方式 2023-10-02 23:51:49 +08:00
YunaiV 6f4c04d944 trade：完善退款详情 2023-10-02 15:44:41 +08:00
puhui999 82210a9583 订单：完善拼团活动 2023-09-30 23:34:45 +08:00
owen 26628913cb 错误码分段 2023-09-29 21:34:38 +08:00
YunaiV 3c643f814c trade：补全售后日志的记录 2023-09-29 11:46:43 +08:00
YunaiV d402bdb7e0 trade：优化售后取消订单的实现代码 2023-09-29 10:08:20 +08:00
YunaiV f9bf41d773 code review：分佣剩余部分的 review 2023-09-28 22:22:38 +08:00
YunaiV 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
 2023-09-28 15:18:59 +08:00
YunaiV eeb8873b1d trade：微调交易配置的注释 2023-09-28 15:10:56 +08:00
YunaiV b9018baa03 trade：简化价格调整的逻辑 2023-09-27 19:14:48 +08:00
YunaiV 26dfbfb2ac trade：发货逻辑，增加订单日志 2023-09-27 09:55:04 +08:00
YunaiV 53bd1b9ec1 trade：订单评论超时时，自动评论 2023-09-26 23:50:54 +08:00
YunaiV cf41347cb3 trade：支付订单成功时，记录订单日志 2023-09-26 22:48:21 +08:00
YunaiV a8c78f3097 trade：增加自动收货的 job 2023-09-26 19:27:37 +08:00
YunaiV 826d792ff2 trade：增加自动取消的 job 2023-09-26 00:04:11 +08:00
YunaiV e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
owen e9fd377772 分销：Review代码修改 2023-09-24 20:28:44 +08:00
YunaiV 421bb7d154 code review：分销逻辑 2023-09-24 11:56:00 +08:00
owen f7296d18b9 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.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/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
 2023-09-24 10:10:53 +08:00
YunaiV b4587fd79e product：订单表，增加 vip 优惠字段 2023-09-24 00:45:32 +08:00
YunaiV 1da14a3f53 trade：删除订单的实现 2023-09-23 20:23:28 +08:00
YunaiV a9485ad6bf trade：取消订单、确认收货，增加订单日志 2023-09-23 18:13:35 +08:00
YunaiV e9c9ac0cab trade：确认收货时，增加订单日志 2023-09-23 17:47:39 +08:00
YunaiV 9451342aae trade：营销商品（拼团、砍价）不能使用优惠劵 2023-09-22 23:54:18 +08:00
owen dc46dff62c Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-22 23:15:31 +08:00
YunaiV 7c4fbc63dc trade：物流费用计算，增加金额 divide 分拆逻辑 2023-09-22 21:56:09 +08:00
owen 637ae8ce1d 分佣: 提现记录 2023-09-22 18:35:43 +08:00
owen a7de955926 trade: 分销业务 - 提现申请 2023-09-22 00:27:45 +08:00
YunaiV 35569c5ec8 trade：下单时，如果是门店自提，增加核销码的生成 2023-09-20 23:21:00 +08:00
YunaiV 1b477aaa0d trade：优化下单逻辑的实现 2023-09-20 20:21:41 +08:00
owen 32e1fc66ce trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
owen a3e161a9a3 trade: 分销业务review代码修改 2023-09-19 16:50:43 +08:00
owen a3e8b42be6 trade: 分销业务review代码修改 2023-09-19 16:37:51 +08:00
YunaiV 1b9a3f9f63 code review：调整操作日志的封装 2023-09-13 23:25:52 +08:00
YunaiV bdd81e4cbc Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
 2023-09-12 12:22:55 +08:00
YunaiV 82c6354e1d code review：分销逻辑 2023-09-12 09:20:42 +08:00
puhui999 254d7828aa mall+order: 订单活动特殊逻辑的抽离 2023-09-11 17:48:01 +08:00
YunaiV 8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
 2023-09-11 16:19:55 +08:00
owen 77daa0085e trade: 分销业务review代码修改 2023-09-11 00:54:12 +08:00
owen 499a054eb9 trade: 分销业务后台功能：推广用户列表 2023-09-10 22:32:39 +08:00
puhui999 51dab96889 支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突 2023-09-10 00:48:30 +08:00
owen f97c7a0f6e trade: 分销业务绑定推广员 2023-09-09 01:46:42 +08:00
dhb52 d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2023-09-09 01:30:51 +08:00
owen 6ef36d5ca6 trade: 增加分销 API 2023-09-08 23:33:02 +08:00
owen 1ead368595 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
owen 1cc2dfc963 trade: 分销Review代码修改 2023-09-08 12:29:38 +08:00
YunaiV 5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
owen 9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:16:47 +08:00
owen a68691f2d9 trade: 增加分销用户表 2023-09-05 23:45:53 +08:00
owen b3fcefa677 trade: 会员取消订单 2023-09-01 20:37:20 +08:00
puhui999 655eefc340 订单管理：完善订单管理提到的一些问题 2023-08-28 09:23:30 +08:00
YunaiV 94a32d34b2 1. 会员用户，增加 point 积分字段 
2. 增加获得优惠劵、收藏数量的 API 接口
 2023-08-19 17:00:40 +08:00
YunaiV f217ba0807 售后： 
1、完善整个流程的实现
 2023-08-18 19:22:08 +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 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 d156d43d63 fix：完善 review 拼团、秒杀活动的实现提到的问题 2023-07-31 18:34:56 +08:00
YunaiV b84f7825c5 review 拼团、秒杀活动的实现 2023-07-26 19:09:47 +08:00
puhui999 8d13ecc9c8 fix：优化订单发货逻辑使其支持一单分发 2023-07-24 15:14:16 +08:00
puhui999 259807600a feat：拼团订单集成 2023-07-21 16:47:04 +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 75afab1f86 售后日志优化 2023-07-07 14:06:56 +08:00
YunaiV 9b90320985 mall + trade： 
1、增加配送信息
 2023-07-02 12:55:15 +08:00
YunaiV 1dfbe45913 mall + order：review 售后日志 2023-06-23 21:50:57 +08:00
chenchen 2f0aaee823 售后日志优化 2023-06-19 17:04:07 +08:00
陈賝 59e16795be !514 mall交易日志封装 
* 交易日志封装
* 交易日志封装
* 交易日志模块
 2023-06-17 14:00:10 +00: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
jason 1662d17fc9 快递客户端 review 修改 2023-06-15 14:59:31 +08:00
jason e69e6d880b 快递价格计算 review 修改 2023-06-15 10:49:24 +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 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 4f5ac0edbb mall + promotion：增加营销活动的 mock 接口 2023-06-10 17:51:15 +08:00
jason dde89d51d5 物流运费计算 review 修改 + 单元测试 2023-06-10 00:15:57 +08:00
YunaiV f2d803c111 mall + product：review 评论接口 2023-06-09 13:59:04 +08:00
puhui999 db7e47faa2 fix：完善 TODO 提到的问题 2023-06-07 14:15:25 +08:00
jason f1fa8eadd2 mall - trade - 新增 TradeDeliveryPriceCalculator 2023-06-03 17:16:18 +08:00
YunaiV e34eddc386 mall + trade：review 自提代码 2023-05-31 09:18:24 +08:00
jason f8db53896f review 修改 2023-05-30 21:17:51 +08:00
YunaiV 0631c51d93 mall + trade：review 配置管理列表 2023-05-28 23:16:11 +08:00
芋道源码 7bfb426a9d
!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 
Merge pull request !484 from Rundeepin/feature/mall_product
 2023-05-21 15:38:48 +00:00
jason 01a67289a9 mall: 订单中心新增运费模板功能 2023-05-21 23:35:07 +08:00