huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-30 03:01:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,643 Commits 1 Branch 0 Tags 176 MiB
8ae3401452
Commit Graph

97 Commits

Author SHA1 Message Date
owen
8ae3401452 会员: 增加会员分组功能 2023-08-22 00:43:36 +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
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
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
2e9dfac9ab 会员积分和会员签到模块todo修改 2023-08-19 14:09:22 +08:00
YunaiV
be2ee905df code review：积分模块的实现 2023-08-11 23:49:20 +08:00
xiaqing
8f43fba629 会员积分针对代码格式、功能优化 
1.修改积分抵扣单位
 2023-08-09 22:31:55 +08:00
xiaqing
bae94d06ac 会员积分针对代码格式、功能优化 
1.优化todo建议
2.删除无用代码
 2023-08-09 20:59:45 +08:00
xiaqing
33323c1483 会员签到针对代码格式、功能优化 
1.优化todo建议
2.删除无用代码
 2023-08-09 16:13:35 +08:00
YunaiV
14d7db0c60 对齐 boot 与 cloud 的代码 2023-07-26 23:27:06 +08:00
YunaiV
a0417f182e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-07-26 19:36:11 +08:00
芋道源码
870873e480
!540 修复部分问题，升级依赖 
Merge pull request !540 from xingyu/feature/captcha
 2023-07-25 11:20:04 +00:00
puhui999
c9c176ea05 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-24 17:30:54 +08:00
YunaiV
3a24d05bdc mall + pay： 
1. 修复单元测试的报错
 2023-07-24 07:04:11 +08:00
xingyu
c95a1d0a7d chore: up springboot 2.10.13 2023-07-21 17:53:40 +08:00
puhui999
e7d8643665 fix：修复 mall review @puhui999 2023-07-10 16:35:49 +08:00
YunaiV
67d60e32f8 mall + pay： 
1、调整微信支付，修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
 2023-07-06 00:19:05 +08:00
芋道源码
11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 2023-07-02 15:41:26 +00:00
YunaiV
040a66965c mall + member： 
1、review 积分
 2023-07-02 23:19:13 +08:00
xiaqing
0200fa6e53 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/pom.xml
 2023-06-28 22:55:53 +08:00
xiaqing
c7ced55a6c 会员中心代码、sql脚本提交 
1.合并积分模块只member module
2.初始化sql放入mysql/member_point.sql
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
 2023-06-28 22:49:19 +08:00
YunaiV
7036a6652c mall + member： 
1、调整收获地址的返回
 2023-06-26 20:07:46 +08:00
xingyu
8ea46b8fc2 fix: getNewPhoneNoInfo 已过期 2023-06-26 16:53:08 +08:00
YunaiV
fd072b7d6e code review：会员积分配置 2023-06-17 18:33:17 +08:00
xingyu
573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
 2023-06-14 15:18:12 +08:00
jason
f1fa8eadd2 mall - trade - 新增 TradeDeliveryPriceCalculator 2023-06-03 17:16:18 +08:00
YunaiV
2a9a869e01 mall + trade：获得订单结算信息，接入支付接口 2023-06-03 00:46:56 +08:00
YunaiV
0631c51d93 mall + trade：review 配置管理列表 2023-05-28 23:16:11 +08:00
YunaiV
7fef594390 订单接口的梳理 2023-05-14 17:35:34 +08:00
xingyu
0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 2023-05-08 10:06:17 +08:00
YunaiV
6115a1ee34 admin-ui 演示环境，迁移到 https://gitee.com/yudaocode/yudao-ui-static 地址 2023-03-05 02:10:16 +08:00
YunaiV
c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
 2023-02-04 10:21:45 +08:00
YunaiV
711a39b8e9 spring doc：增加模块分组 2023-01-19 15:03:46 +08:00