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

4646 Commits (81c12b185208ad4f46470a634d6e292485e00ad5)
 

Author SHA1 Message Date
shizhong 81c12b1852 解决MapStruct的时区问题 2 years ago
shizhong eb4434ecbc 解决MapStruct的时区问题 2 years ago
芋道源码 287a17a9ff
!583 调整 获取用户积分记录 和 获取用户签到记录接口 配合前端用户详情页面 
Merge pull request !583 from 风狗/会员详情
 2 years ago
绮梦 0753df68b8 feat: 获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持。 2 years ago
芋道源码 8f9404f99b
!579 同步商城实现：会员列表、会员积分、会员签到、会员标签 
Merge pull request !579 from 芋道源码/feature/mall_product
 2 years ago
YunaiV c3e4e23459 同步最新 Member 菜单 2 years ago
芋道源码 3124948175
!578 同步商城实现：会员列表、会员积分、会员签到、会员标签 
Merge pull request !578 from 芋道源码/feature/mall_product
 2 years ago
YunaiV 281ba1e369 code review：调整错误码分段 2 years ago
YunaiV a83c156bf1 code review：签到记录 2 years ago
YunaiV c5e85f3bfb code review：签到配置 2 years ago
YunaiV 4257cad46a code review：会员积分 2 years ago
YunaiV c7285da9a7 code review：会员签到配置 2 years ago
YunaiV bfc72a9802 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
 2 years ago
芋道源码 fe53e426a4
!573 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 
Merge pull request !573 from Carry/master
 2 years ago
芋道源码 29ae1bcbca
!575 会员积分和会员签到模块todo修改 
Merge pull request !575 from QingX/feature/mall_product
 2 years ago
YunaiV 2584911d88 code review：会员标签 2 years ago
YunaiV 8191d9e141 Merge branch 'member_dev' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
 2 years ago
YunaiV 95254341a1 1. 会员用户的找回密码 API 的优化 2 years ago
owen 4f589cad53 会员： 
1.会员设置标签
 3 years ago
YunaiV 5d4a7ffa3b 1. 会员用户的修改密码 API 的优化 3 years ago
YunaiV 87e5b2bed1 1. 会员用户的修改手机 API 的优化 3 years ago
YunaiV 4153331535 1. 合并 member 修改昵称和头像接口，统一成修改基本信息 API 3 years ago
YunaiV 94a32d34b2 1. 会员用户，增加 point 积分字段 
2. 增加获得优惠劵、收藏数量的 API 接口
 3 years ago
owen 9b6e2114c7 会员： 
1.增加会员标签功能
 3 years ago
YunaiV a4e2cacc46 会员中心：会员管理 60% 3 years ago
YunaiV e8c1bdde3d 会员中心：会员管理 50% 3 years ago
xiaqing db1f44305d 会员积分和会员签到模块todo修改 3 years ago
xiaqing 2e9dfac9ab 会员积分和会员签到模块todo修改 3 years ago
YunaiV 61fbb9909a 订单： 
1、简化交易订单的逻辑
 3 years ago
YunaiV fe07e223e4 订单： 
1、简化交易订单的逻辑
 3 years ago
YunaiV f217ba0807 售后： 
1、完善整个流程的实现
 3 years ago
wanglei 6446b753d3 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago
YunaiV 97fc4027de Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImplTest.java
 3 years ago
YunaiV 5dd6e5bee8 营销： 
1. 售后订单，增加对 afterSaleId 的更新
 3 years ago
jason 6fbf7b261b 扫码支付统一退款单元测试， 修复退款失败，渠道错误未赋值bug 3 years ago
YunaiV d3c02f2a57 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 3 years ago
YunaiV c3de25e760 营销： 
1. 调整店铺装修接口
 3 years ago
jason 1b03fdb08b 支付宝 扫码支付 统一下单 单元测试 3 years ago
YunaiV a159a983a2 订单： 
1. 拆分读写 OrderService，避免单 Service 逻辑过重。
 3 years ago
YunaiV 159c74ce15 订单： 
1. review 发货
2. review 拼团逻辑
 3 years ago
芋道源码 60171ce7e4
!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 
Merge pull request !571 from puhui999/feature/mall_product
 3 years ago
YunaiV e4a2c738b2 订单： 
1. 增加查询物流接口
 3 years ago
puhui999 5c2723c7bf fix: 修复合并差异 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 e2a8f7b389 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 3 years ago
puhui999 651725e3e8 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 3 years ago
YunaiV 36da5d69b0 1、增加 App 的文件上传接口 3 years ago
YunaiV 715c42574f 订单： 
1、订单评价的接入
 3 years ago
YunaiV 7dc398717a 订单： 
1、实现确认收货接口
 3 years ago
YunaiV 503c996acd 订单： 
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
 3 years ago