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

233 Commits (7fdd36d97978be36d0ea45dcb5e840b1cf76c865)

Author SHA1 Message Date
YunaiV 7389e4fb65 分佣：增加获得分销记录分页 API mock 2 years ago
YunaiV fc56a15f76 分佣：增加用户分销记录、提现 API mock 2 years ago
YunaiV 6a819da0b6 分佣：增加用户分销统计 API mock 2 years ago
owen 991b53649b member: 分销配置 2 years ago
YunaiV 4809e9b462 修复单元测试报错的问题 2 years ago
YunaiV 9148170926 调整 mapper 命名，避免可能的冲突 2 years ago
YunaiV e6f1e5d968 同步最新商城演示图 2 years ago
YunaiV 5a788af084 购物车：简化 cart 表命名 2 years ago
YunaiV ddcb3e69f9 会员等级 app 接口 2 years ago
YunaiV f5c5d38303 code review：商品评论 2 years ago
芋道源码 806228be8b
!593 商品评论表增加冗余 SKU 的图片地址, 规格 
Merge pull request !593 from 疯狂的世界/owen_dev
 2 years ago
YunaiV 99dd33c408 code review：会员中心的详情返回 totalPoint 积分 2 years ago
owen 1e2c83d90f mall: 商品评论表增加冗余 SKU 的图片地址, 规格 2 years ago
owen 02abe86253 member: 
1.用户积分变动方法, 提取到单独的接口中
2.规范代码
 2 years ago
绮梦 f10b638caf feat: 获得会员用户接口增加经验值字段 2 years ago
YunaiV f6f33a07d0 code review：订单评论、订单积分的变更 2 years ago
YunaiV b75d777670 code review：订单评论、订单积分的变更 2 years ago
芋道源码 f8952f8e34
!591 商品：完善商品评论功能 
Merge pull request !591 from 疯狂的世界/owen_dev
 2 years ago
YunaiV 583d34a801 code review：移除收件地址多余的方法 2 years ago
YunaiV 1b192b5032 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2 years ago
YunaiV 61d51e54dc 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/convert/user/MemberUserConvert.java
 2 years ago
owen fd126ba2f7 member: 根据积分配置的比例，换算积分 2 years ago
owen d4acacec60 trade: 1.支付成功后，增加用户积分；2.退款成功后，扣减用户积分 2 years ago
owen 9aee08ee0e 会员：修改Review的代码 2 years ago
绮梦 65eddc63af feat: 增加管理后台用户收件地址管理接口。 2 years ago
YunaiV 9b6f5bd503 code review：会员等级 2 years ago
绮梦 55cae6d2aa feat: 获取用户信息接口增加areaName 字段。 2 years ago
owen da8b2eab6d 合并冲突 2 years ago
owen 4dd2d80887 Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 
# Conflicts:
#	sql/mysql/member_level.sql
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
 2 years ago
owen 4132cf1437 会员: 会员等级取消分页功能 2 years ago
owen dc382d80bb 会员: 重构会员等级逻辑 2 years ago
YunaiV 60875a0472 code review：获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持 2 years ago
YunaiV 175d244dee Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2 years ago
YunaiV 54bf24b966 code review：会员等级 2 years ago
owen b7f54a3061 Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
 2 years ago
owen ca51056c00 会员: 统一用户等级记录、用户经验记录 命名 2 years ago
绮梦 0753df68b8 feat: 获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持。 2 years ago
YunaiV 551a968449 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
 2 years ago
YunaiV 292f23c4b2 code review：会员等级 2 years ago
owen bdb38c4157 会员: 修改会员等级，使用单独的表单、接口 2 years ago
owen 5a2d9d14df 会员: 删除用户标签, 用户等级时, 校验是否关联了用户 2 years ago
owen 7fd497fcc9 会员: 修改重复的错误码 2 years ago
owen 7b2f639324 会员: 规范代码, 用户等级, 用户分组 2 years ago
owen 9d9638b15b Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
 2 years ago
owen 8ae3401452 会员: 增加会员分组功能 2 years ago
YunaiV 800c44a46e code review：会员等级 2 years ago
芋道源码 4cd5b5712b
!577 会员：修改会员标签名称唯一校验逻辑 
Merge pull request !577 from 疯狂的世界/member_dev
 2 years ago
YunaiV 0d1fc1138a 增加 app 的签到 mock 接口、积分记录分页、签到记录分页 2 years ago
owen de83531285 会员：用户标签增加下拉框使用的 精简信息列表查询接口 2 years ago
owen e711092440 会员：用户管理增加用户等级查询条件 2 years ago
owen 8ffbc15cec 会员：后台调整会员等级 2 years ago
owen f884054d2c 会员：完善会员等级校验、单元测试 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
owen e2032e7e97 会员：增加会员等级增删改查 2 years ago
owen 9eca965dd6 Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 2 years ago
YunaiV c7285da9a7 code review：会员签到配置 2 years ago
owen fe68b42a8c 会员：修改会员标签名称唯一校验逻辑 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 的优化 3 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 2e9dfac9ab 会员积分和会员签到模块todo修改 3 years ago
YunaiV be2ee905df code review：积分模块的实现 3 years ago
xiaqing 8f43fba629 会员积分针对代码格式、功能优化 
1.修改积分抵扣单位
 3 years ago
xiaqing bae94d06ac 会员积分针对代码格式、功能优化 
1.优化todo建议
2.删除无用代码
 3 years ago
xiaqing 33323c1483 会员签到针对代码格式、功能优化 
1.优化todo建议
2.删除无用代码
 3 years ago
YunaiV 14d7db0c60 对齐 boot 与 cloud 的代码 3 years ago
YunaiV a0417f182e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
芋道源码 870873e480
!540 修复部分问题，升级依赖 
Merge pull request !540 from xingyu/feature/captcha
 3 years ago
puhui999 c9c176ea05 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
YunaiV 3a24d05bdc mall + pay： 
1. 修复单元测试的报错
 3 years ago
xingyu c95a1d0a7d chore: up springboot 2.10.13 3 years ago
puhui999 e7d8643665 fix：修复 mall review @puhui999 3 years ago
YunaiV 67d60e32f8 mall + pay： 
1、调整微信支付，修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
 3 years ago
芋道源码 11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 3 years ago
YunaiV 040a66965c mall + member： 
1、review 积分
 3 years ago
芋道源码 2f42964a96
!524 会员中心合并至member 模块 
Merge pull request !524 from QingX/feature/mall_product
 3 years ago
YunaiV 3750dc76c7 mall + trade： 
1、获取订单结算信息，增加积分的 mock 返回
 3 years ago
xiaqing 0200fa6e53 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/pom.xml
 3 years ago
xiaqing c7ced55a6c 会员中心代码、sql脚本提交 
1.合并积分模块只member module
2.初始化sql放入mysql/member_point.sql
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
 3 years ago
YunaiV 7036a6652c mall + member： 
1、调整收获地址的返回
 3 years ago
xingyu 8ea46b8fc2 fix: getNewPhoneNoInfo 已过期 3 years ago
YunaiV fd072b7d6e code review：会员积分配置 3 years ago
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
 3 years ago
jason f1fa8eadd2 mall - trade - 新增 TradeDeliveryPriceCalculator 3 years ago
YunaiV 2a9a869e01 mall + trade：获得订单结算信息，接入支付接口 3 years ago
YunaiV 0631c51d93 mall + trade：review 配置管理列表 3 years ago
YunaiV 7fef594390 订单接口的梳理 3 years ago
xingyu 0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago