linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,325 Commits
4 Branches
0 Tags
169 MiB
main
liutao_branch
hhk
plp
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '1bb2010dc0'
${ noResults }
Commit Graph

183 Commits (1bb2010dc0ed73b1bf8fc8d936a11ee72222927e)

Author SHA1 Message Date
zhijiantianya@gmail.com 4b0333f3e9 code review：订单统计 2 years ago
owen 6fbb7d6d6d 终端类型参数改为从Controller传入 2 years ago
owen 76f512fc7a 1. APP增加终端Header[terminal] 
2. 订单、会员注册记录来源终端
 2 years ago
YunaiV 1ac2f2b5c2 code review：会员统计 2 years ago
YunaiV 704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2 years ago
puhui999 bccd270fc7 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 2 years ago
owen 74a5e40d8d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2 years ago
owen df16278a03 统计：会员统计 2 years ago
puhui999 2e559ebe06 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/service/combination/CombinationRecordServiceImpl.java
 2 years ago
puhui999 c8a9d68933 拼团活动：完善 review 提到的问题 2 years ago
YunaiV 01e6140d67 code review：拼团记录流程 2 years ago
YunaiV 99649bfdb8 code review：拼团记录流程 2 years ago
puhui999 6636ee7420 拼团记录(APP)：新增一个取消拼团的接口 2 years ago
YunaiV a1e9bedf34 promotion：完善秒杀的 uniapp 接口 3 years ago
owen b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 3 years ago
owen d0f0bc5888 分销：调整推广人列表查询方式 3 years ago
YunaiV 1f910992d6 trade：新增是否自提的配置项 3 years ago
YunaiV 6f4c04d944 trade：完善退款详情 3 years ago
YunaiV d4417d2474 code review：积分、优惠劵、佣金等逻辑 3 years ago
YunaiV 057952bdeb Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
 3 years ago
owen cafa938ff4 common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间 3 years ago
puhui999 597eacaaeb Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
 3 years ago
puhui999 0b35d4a7e3 订单：完善拼团活动部分 TODO 3 years ago
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
 3 years ago
YunaiV 53bd1b9ec1 trade：订单评论超时时，自动评论 3 years ago
YunaiV e384b810bf code review：分销逻辑 3 years ago
owen e9fd377772 分销：Review代码修改 3 years ago
puhui999 6ef94ade6a 完善订单和活动 review 提到的问题 3 years ago
YunaiV c766f7daa5 code review：砍价、秒杀的逻辑 3 years ago
puhui999 408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 3 years ago
YunaiV b81ebe6f19 修复 common 下的 test 引入不正确的问题，减少包依赖大小 3 years ago
YunaiV ab800aa891 1. 简化 JsonUtils 初始化方式，去掉 BeanPostProcessor 
2. 减少日志打印

目的：优化启动速度
 3 years ago
芋道源码 3b5215db21
!611 分销用户管理、Review代码修改 
Merge pull request !611 from 疯狂的世界/brokerate
 3 years ago
YunaiV 87c55784c4 code review：营销活动+订单 3 years ago
owen ddcebb1986 common: MoneyUtils 移到 common 模块 3 years ago
puhui999 5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
puhui999 2591ab5d36 订单中心+营销活动：完善部分 TODO 提到的问题 3 years ago
YunaiV e4b153a866 分佣：增加获得分销排行分页 API mock 3 years ago
YunaiV b69d4e0852 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
owen 6a7be19d3a common: 增加InEnumCollectionValidator，用于校验枚举值列表参数的取值范围是否有䇅 3 years ago
shizhong eb4434ecbc 解决MapStruct的时区问题 3 years ago
YunaiV e8c1bdde3d 会员中心：会员管理 50% 3 years ago
zhijiantianya@gmail.com ba59ec85e0 code review 各种活动 3 years ago
puhui999 384359c9d4 fix: 完善拼团、秒杀、砍价活动管理 3 years ago
puhui999 5f9184904a fix: 完善拼团、秒杀、砍价活动管理 3 years ago
YunaiV 222d1cf69b 增加对比新老数组的 C/U/D 对象 3 years ago
YunaiV 5e2fa48f20 code review：拼团、秒杀活动的代码 3 years ago
puhui999 92b10e2ecf Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
puhui999 d156d43d63 fix：完善 review 拼团、秒杀活动的实现提到的问题 3 years ago
puhui999 446951bd11 fix：封装函数 convertCDUMap 作用：数据划分为需要新增的、还是删除的、还是更新的。 3 years ago