芋道源码
|
4cd5b5712b
|
!577 会员：修改会员标签名称唯一校验逻辑
Merge pull request !577 from 疯狂的世界/member_dev
|
2023-08-21 14:51:19 +00:00 |
|
YunaiV
|
0d1fc1138a
|
增加 app 的签到 mock 接口、积分记录分页、签到记录分页
|
2023-08-21 22:20:59 +08:00 |
|
owen
|
de83531285
|
会员：用户标签增加下拉框使用的 精简信息列表查询接口
|
2023-08-21 21:44:04 +08:00 |
|
owen
|
e711092440
|
会员：用户管理增加用户等级查询条件
|
2023-08-21 21:42:59 +08:00 |
|
owen
|
8ffbc15cec
|
会员：后台调整会员等级
|
2023-08-21 21:31:16 +08:00 |
|
owen
|
f884054d2c
|
会员：完善会员等级校验、单元测试
|
2023-08-21 00:23:45 +08:00 |
|
芋道源码
|
8f9404f99b
|
!579 同步商城实现：会员列表、会员积分、会员签到、会员标签
Merge pull request !579 from 芋道源码/feature/mall_product
|
2023-08-20 12:01:43 +00:00 |
|
YunaiV
|
c3e4e23459
|
同步最新 Member 菜单
|
2023-08-20 20:01:18 +08:00 |
|
芋道源码
|
3124948175
|
!578 同步商城实现：会员列表、会员积分、会员签到、会员标签
Merge pull request !578 from 芋道源码/feature/mall_product
|
2023-08-20 11:50:58 +00:00 |
|
YunaiV
|
281ba1e369
|
code review：调整错误码分段
|
2023-08-20 19:38:17 +08:00 |
|
YunaiV
|
a83c156bf1
|
code review：签到记录
|
2023-08-20 19:34:28 +08:00 |
|
YunaiV
|
c5e85f3bfb
|
code review：签到配置
|
2023-08-20 19:26:31 +08:00 |
|
YunaiV
|
4257cad46a
|
code review：会员积分
|
2023-08-20 19:06:23 +08:00 |
|
owen
|
e2032e7e97
|
会员：增加会员等级增删改查
|
2023-08-20 15:54:06 +08:00 |
|
owen
|
9eca965dd6
|
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
|
2023-08-20 10:55:42 +08:00 |
|
YunaiV
|
c7285da9a7
|
code review：会员签到配置
|
2023-08-20 10:14:28 +08:00 |
|
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
|
2023-08-20 09:45:34 +08:00 |
|
芋道源码
|
fe53e426a4
|
!573 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
Merge pull request !573 from Carry/master
|
2023-08-20 01:44:35 +00:00 |
|
owen
|
fe68b42a8c
|
会员：修改会员标签名称唯一校验逻辑
|
2023-08-20 09:41:15 +08:00 |
|
芋道源码
|
29ae1bcbca
|
!575 会员积分和会员签到模块todo修改
Merge pull request !575 from QingX/feature/mall_product
|
2023-08-20 01:36:32 +00:00 |
|
YunaiV
|
2584911d88
|
code review：会员标签
|
2023-08-20 09:25:23 +08:00 |
|
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
|
2023-08-20 09:02:16 +08:00 |
|
YunaiV
|
95254341a1
|
1. 会员用户的找回密码 API 的优化
|
2023-08-19 23:12:34 +08:00 |
|
owen
|
4f589cad53
|
会员：
1.会员设置标签
|
2023-08-19 20:19:56 +08:00 |
|
YunaiV
|
5d4a7ffa3b
|
1. 会员用户的修改密码 API 的优化
|
2023-08-19 20:16:41 +08:00 |
|
YunaiV
|
87e5b2bed1
|
1. 会员用户的修改手机 API 的优化
|
2023-08-19 19:23:54 +08:00 |
|
YunaiV
|
4153331535
|
1. 合并 member 修改昵称和头像接口，统一成修改基本信息 API
|
2023-08-19 17:47:34 +08:00 |
|
YunaiV
|
94a32d34b2
|
1. 会员用户，增加 point 积分字段
2. 增加获得优惠劵、收藏数量的 API 接口
|
2023-08-19 17:00:40 +08:00 |
|
owen
|
9b6e2114c7
|
会员：
1.增加会员标签功能
|
2023-08-19 16:06:12 +08:00 |
|
YunaiV
|
a4e2cacc46
|
会员中心：会员管理 60%
|
2023-08-19 14:43:53 +08:00 |
|
YunaiV
|
e8c1bdde3d
|
会员中心：会员管理 50%
|
2023-08-19 14:12:03 +08:00 |
|
xiaqing
|
db1f44305d
|
会员积分和会员签到模块todo修改
|
2023-08-19 14:09:47 +08:00 |
|
xiaqing
|
2e9dfac9ab
|
会员积分和会员签到模块todo修改
|
2023-08-19 14:09:22 +08:00 |
|
YunaiV
|
61fbb9909a
|
订单：
1、简化交易订单的逻辑
|
2023-08-18 19:59:30 +08:00 |
|
YunaiV
|
fe07e223e4
|
订单：
1、简化交易订单的逻辑
|
2023-08-18 19:28:36 +08:00 |
|
YunaiV
|
f217ba0807
|
售后：
1、完善整个流程的实现
|
2023-08-18 19:22:08 +08:00 |
|
wanglei
|
6446b753d3
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
2023-08-18 10:56:08 +08:00 |
|
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
|
2023-08-17 22:32:48 +08:00 |
|
YunaiV
|
5dd6e5bee8
|
营销：
1. 售后订单，增加对 afterSaleId 的更新
|
2023-08-17 22:32:30 +08:00 |
|
jason
|
6fbf7b261b
|
扫码支付统一退款单元测试， 修复退款失败，渠道错误未赋值bug
|
2023-08-17 21:52:53 +08:00 |
|
YunaiV
|
d3c02f2a57
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-08-16 22:11:27 +08:00 |
|
YunaiV
|
c3de25e760
|
营销：
1. 调整店铺装修接口
|
2023-08-16 22:11:18 +08:00 |
|
jason
|
1b03fdb08b
|
支付宝 扫码支付 统一下单 单元测试
|
2023-08-16 08:51:27 +08:00 |
|
YunaiV
|
a159a983a2
|
订单：
1. 拆分读写 OrderService，避免单 Service 逻辑过重。
|
2023-08-15 21:19:13 +08:00 |
|
YunaiV
|
159c74ce15
|
订单：
1. review 发货
2. review 拼团逻辑
|
2023-08-15 21:04:20 +08:00 |
|
芋道源码
|
60171ce7e4
|
!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑
Merge pull request !571 from puhui999/feature/mall_product
|
2023-08-15 12:29:51 +00:00 |
|
YunaiV
|
e4a2c738b2
|
订单：
1. 增加查询物流接口
|
2023-08-15 20:18:22 +08:00 |
|
lemoncc
|
5b9106fdb5
|
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
|
2023-08-15 17:54:55 +08:00 |
|
puhui999
|
5c2723c7bf
|
fix: 修复合并差异
|
2023-08-15 00:02:50 +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 |
|