linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,048 Commits
3 Branches
0 Tags
333 MiB
main
hhk
plp
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
Commit Graph

149 Commits (main)

Author SHA1 Message Date
YunaiV a9485ad6bf trade：取消订单、确认收货，增加订单日志 2 years ago
YunaiV e9c9ac0cab trade：确认收货时，增加订单日志 2 years ago
YunaiV 9451342aae trade：营销商品（拼团、砍价）不能使用优惠劵 2 years ago
owen dc46dff62c Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2 years ago
YunaiV 7c4fbc63dc trade：物流费用计算，增加金额 divide 分拆逻辑 2 years ago
owen 637ae8ce1d 分佣: 提现记录 2 years ago
owen a7de955926 trade: 分销业务 - 提现申请 2 years ago
YunaiV 35569c5ec8 trade：下单时，如果是门店自提，增加核销码的生成 2 years ago
YunaiV 1b477aaa0d trade：优化下单逻辑的实现 2 years ago
owen 32e1fc66ce trade: 分销业务 - 佣金提现后台管理 2 years ago
owen a3e161a9a3 trade: 分销业务review代码修改 2 years ago
owen a3e8b42be6 trade: 分销业务review代码修改 2 years ago
YunaiV 1b9a3f9f63 code review：调整操作日志的封装 2 years ago
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
 2 years ago
YunaiV 82c6354e1d code review：分销逻辑 2 years ago
puhui999 254d7828aa mall+order: 订单活动特殊逻辑的抽离 2 years ago
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
 2 years ago
owen 77daa0085e trade: 分销业务review代码修改 2 years ago
owen 499a054eb9 trade: 分销业务后台功能：推广用户列表 2 years ago
puhui999 51dab96889 支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突 2 years ago
owen f97c7a0f6e trade: 分销业务绑定推广员 2 years ago
dhb52 d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2 years ago
owen 6ef36d5ca6 trade: 增加分销 API 2 years ago
owen 1ead368595 trade: 优化分销用户佣金字段名称 2 years ago
owen 1cc2dfc963 trade: 分销Review代码修改 2 years ago
YunaiV 5808f77ade code review：订单分佣 2 years ago
owen 9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 2 years ago
owen a68691f2d9 trade: 增加分销用户表 2 years ago
owen b3fcefa677 trade: 会员取消订单 2 years ago
puhui999 655eefc340 订单管理：完善订单管理提到的一些问题 2 years ago
YunaiV 94a32d34b2 1. 会员用户，增加 point 积分字段 
2. 增加获得优惠劵、收藏数量的 API 接口
 3 years ago
YunaiV f217ba0807 售后： 
1、完善整个流程的实现
 3 years ago
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
 3 years ago
puhui999 651725e3e8 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 3 years ago
YunaiV 503c996acd 订单： 
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
 3 years ago
zhijiantianya@gmail.com ba59ec85e0 code review 各种活动 3 years ago
puhui999 384359c9d4 fix: 完善拼团、秒杀、砍价活动管理 3 years ago
puhui999 d156d43d63 fix：完善 review 拼团、秒杀活动的实现提到的问题 3 years ago
YunaiV b84f7825c5 review 拼团、秒杀活动的实现 3 years ago
puhui999 8d13ecc9c8 fix：优化订单发货逻辑使其支持一单分发 3 years ago
puhui999 259807600a feat：拼团订单集成 3 years ago
puhui999 e7d8643665 fix：修复 mall review @puhui999 3 years ago
chenchen 284506b356 mall 下单日志 3 years ago
chenchen 75afab1f86 售后日志优化 3 years ago
YunaiV 9b90320985 mall + trade： 
1、增加配送信息
 3 years ago
YunaiV 1dfbe45913 mall + order：review 售后日志 3 years ago
chenchen 2f0aaee823 售后日志优化 3 years ago
陈賝 59e16795be !514 mall交易日志封装 
* 交易日志封装
* 交易日志封装
* 交易日志模块
 3 years ago
芋道源码 08535d6019
!509 完善商品评论 
Merge pull request !509 from puhui999/feature/mall_product
 3 years ago
YunaiV 0d47d6cead mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉 3 years ago
YunaiV 59d5fef592 mall + trade：优化运费模版的代码 3 years ago
jason 1662d17fc9 快递客户端 review 修改 3 years ago
jason e69e6d880b 快递价格计算 review 修改 3 years ago
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
 3 years ago
puhui999 20100aa78b fix：完善商品评论 3 years ago
YunaiV e1a8e45ac7 mall + trade：快递价格计算 3 years ago
jason 644d976a78 快递100 快递查询实现 3 years ago
jason 45e5578cb4 快递查询、 通过快递鸟查询实现 3 years ago
YunaiV 4f5ac0edbb mall + promotion：增加营销活动的 mock 接口 3 years ago
jason dde89d51d5 物流运费计算 review 修改 + 单元测试 3 years ago
YunaiV f2d803c111 mall + product：review 评论接口 3 years ago
puhui999 db7e47faa2 fix：完善 TODO 提到的问题 3 years ago
jason f1fa8eadd2 mall - trade - 新增 TradeDeliveryPriceCalculator 3 years ago
YunaiV e34eddc386 mall + trade：review 自提代码 3 years ago
jason f8db53896f review 修改 3 years ago
YunaiV 0631c51d93 mall + trade：review 配置管理列表 3 years ago
芋道源码 7bfb426a9d
!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 
Merge pull request !484 from Rundeepin/feature/mall_product
 3 years ago
jason 01a67289a9 mall: 订单中心新增运费模板功能 3 years ago
YunaiV e942b52a67 mall：订单详情：调整售后字段 3 years ago
YunaiV e745bb6675 mall：订单列表：增加订单类型的接入 3 years ago
崔家辉 fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 3 years ago
jason 3da2eb89b2 新增快递公司功能 3 years ago
YunaiV db73ddc942 REVIEW 物流配送管理表 3 years ago
jason 4b643a7b34 物流配送管理表结构修改 3 years ago
YunaiV 7fef594390 订单接口的梳理 3 years ago
YunaiV f7fe9ad7b0 1. 商城：调整购物车的失效逻辑实现，基于 SPU 是否下架 
2. 商城：增加购物车失效的重选逻辑
 3 years ago
YunaiV b7d78a24a4 trade：完成管理后台的订单详情的简单对接 3 years ago
YunaiV 7fc9689f07 trade：定义管理后台的订单分页接口 3 years ago
YunaiV 7056d89b0c trade：完成交易订单的收货逻辑 3 years ago
YunaiV 66abe4a84b trade：完成交易订单的发货逻辑 3 years ago
YunaiV e96422a47e trade：完成支付成功后的回调，更新订单为已支付 3 years ago
YunaiV 64df5ce5f4 trade：【交易售后】增加会员取消售后 3 years ago
YunaiV ed9c8d4a78 trade：【交易售后】增加售后日志 3 years ago
YunaiV 00e66216c5 trade：【交易售后】查询分页列表的前端 3 years ago
YunaiV 35528e8267 trade：【交易售后】查询分页列表 3 years ago
YunaiV cd2bc112cc trade：【交易售后】完善发起、同意、不同意、收货、拒绝收货、退款的逻辑 3 years ago
YunaiV ee1d362a7c trade：【交易售后】回调退款 3 years ago
YunaiV 67050eeaa8 trade：【交易售后】确认收货 3 years ago
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 01d10b518c trade：优化创建订单接口的后端实现 3 years ago
YunaiV 15798cea10 mall：价格计算的 API 简单实现 3 years ago
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 3 years ago
YunaiV face9cae76 mall：调整 trade 的接口 4 years ago
YunaiV cfde3dcacb mall：优化订单表的设计 4 years ago
YunaiV 96e2a27d07 mall：初始化 trade 表结构 4 years ago
YunaiV 2b71a1588c mall：初始化 trade 交易模块 4 years ago