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

283 Commits (72d1836fd3f3df4ff0bd251deb7c7413b8d1bdd3)

Author SHA1 Message Date
owen 7fdd36d979 Review代码修改 2 years ago
YunaiV d4417d2474 code review：积分、优惠劵、佣金等逻辑 2 years ago
owen 2168145c3e 会员：会员配置的积分相关字段加上point前缀 2 years ago
owen ab35fcbe9b 会员：积分配置改为会员配置 2 years ago
owen 4f03635fcd 签到：签到后增加用户积分、经验 2 years ago
owen e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
owen fc432ba073 优惠券：新人券使用 MQ 发放 2 years ago
owen 497ea2eee8 会员详情，修改会员积分 2 years ago
YunaiV 367b45e3bd code review：数据统计 2 years ago
owen 26628913cb 错误码分段 2 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
 2 years ago
YunaiV 9e3564bd6a code review：优惠劵逻辑 2 years ago
YunaiV ad535e674f trade：积分相关的价格计算 2 years ago
YunaiV e384b810bf code review：分销逻辑 2 years ago
dhb52 96d4e7bc56 fix: 需要填充错误信息中的参数 2 years ago
owen e9fd377772 分销：Review代码修改 2 years ago
owen f7296d18b9 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
 2 years ago
YunaiV 53e789dfdc trade：订单表，增加 vip 优惠字段 2 years ago
owen 052328c5fa 积分：完善积分获得、退还、使用 相关逻辑 2 years ago
YunaiV 1b477aaa0d trade：优化下单逻辑的实现 2 years ago
YunaiV be1ecf96d4 code review：会员签到逻辑 2 years ago
xiaqing d4a891e6c4 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2 years ago
xiaqing e893cfd757 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
 2 years ago
xiaqing 9d262e8e7f 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2 years ago
YunaiV 8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	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/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.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
 2 years ago
owen cddeb37289 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
 2 years ago
owen dffdd471d5 member: 修正 查询用户列表方法，传入的ID集合为空时，会导致异常的问题 2 years ago
YunaiV 40e1a879e3 登录：社交登录时，额外返回 openid 2 years ago
YunaiV 65d7b30011 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 557b09a157 code review：分销逻辑 2 years ago
dhb52 d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2 years ago
owen 6ef36d5ca6 trade: 增加分销 API 2 years ago
lemoncc 2fd201c7fa
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum 2 years ago
owen 1cc2dfc963 trade: 分销Review代码修改 2 years ago
owen 166b1b31c0 trade: 分销用户管理 2 years ago
YunaiV 5808f77ade code review：订单分佣 2 years ago
YunaiV b8a4d8cab2 分销：避免报错 2 years ago
YunaiV eb342d5abf Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2 years ago
芋道源码 ea26691967
!607 member: 佣金解冻 
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
 2 years ago
YunaiV bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2 years ago
owen fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord 2 years ago
owen 9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 2 years ago
YunaiV 0329f13fbf 分佣：增加获得分销排行分页 API mock 2 years ago
owen 9eb7837b67 member: 佣金失效 2 years ago
owen a708521b9d member: 佣金解冻 2 years ago
owen 2f6092005b member: 佣金解冻 2 years ago
芋道源码 a58d7d63ed
!606 会员：分销佣金计算 
Merge pull request !606 from 疯狂的世界/brokerage
 2 years ago
owen 090058a2ba member: 佣金不冻结时，直接就是结算状态 2 years ago
owen c7ef8519c8 member: 分销增加佣金 2 years ago
YunaiV eae8218f0d 分佣：增加获得分销排行分页 API mock 2 years ago
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