huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 15:51:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,134 Commits 1 Branch 0 Tags 176 MiB
d4417d2474
Commit Graph

188 Commits

Author SHA1 Message Date
YunaiV
d4417d2474 code review：积分、优惠劵、佣金等逻辑 2023-10-01 23:31:07 +08:00
owen
2168145c3e 会员：会员配置的积分相关字段加上point前缀 2023-10-01 10:41:21 +08:00
owen
ab35fcbe9b 会员：积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen
4f03635fcd 签到：签到后增加用户积分、经验 2023-10-01 09:53:54 +08:00
owen
e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-30 22:09:49 +08:00
owen
fc432ba073 优惠券：新人券使用 MQ 发放 2023-09-30 17:29:32 +08:00
owen
497ea2eee8 会员详情，修改会员积分 2023-09-30 15:50:13 +08:00
YunaiV
367b45e3bd code review：数据统计 2023-09-30 12:30:01 +08:00
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
 2023-09-28 15:18:59 +08:00
YunaiV
9e3564bd6a code review：优惠劵逻辑 2023-09-28 09:23:42 +08:00
dhb52
96d4e7bc56 fix: 需要填充错误信息中的参数 2023-09-24 22:23:31 +08:00
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
 2023-09-24 10:10:53 +08:00
YunaiV
53e789dfdc trade：订单表，增加 vip 优惠字段 2023-09-23 23:58:22 +08:00
owen
052328c5fa 积分：完善积分获得、退还、使用 相关逻辑 2023-09-23 14:11:16 +08:00
YunaiV
1b477aaa0d trade：优化下单逻辑的实现 2023-09-20 20:21:41 +08:00
YunaiV
be1ecf96d4 code review：会员签到逻辑 2023-09-18 22:18:42 +08:00
xiaqing
d4a891e6c4 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2023-09-15 23:21:11 +08:00
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
 2023-09-15 15:27:59 +08:00
xiaqing
9d262e8e7f 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2023-09-15 15:20:39 +08:00
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
 2023-09-11 16:19:55 +08:00
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
 2023-09-10 23:56:00 +08:00
owen
dffdd471d5 member: 修正 查询用户列表方法，传入的ID集合为空时，会导致异常的问题 2023-09-10 23:32:40 +08:00
YunaiV
40e1a879e3 登录：社交登录时，额外返回 openid 2023-09-10 18:01:53 +08:00
YunaiV
557b09a157 code review：分销逻辑 2023-09-09 09:41:57 +08:00
owen
6ef36d5ca6 trade: 增加分销 API 2023-09-08 23:33:02 +08:00
lemoncc
2fd201c7fa
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum 2023-09-08 16:33:49 +08:00
owen
166b1b31c0 trade: 分销用户管理 2023-09-08 11:03:57 +08:00
YunaiV
5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
YunaiV
b8a4d8cab2 分销：避免报错 2023-09-07 12:29:50 +08:00
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
 2023-09-06 23:50:55 +08:00
芋道源码
ea26691967
!607 member: 佣金解冻 
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
 2023-09-06 15:49:39 +00:00
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
 2023-09-06 21:40:53 +08:00
owen
fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord 2023-09-06 00:35:40 +08:00
owen
9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:16:47 +08:00
YunaiV
0329f13fbf 分佣：增加获得分销排行分页 API mock 2023-09-05 21:32:34 +08:00
owen
9eb7837b67 member: 佣金失效 2023-09-05 19:43:07 +08:00
owen
a708521b9d member: 佣金解冻 2023-09-05 19:05:01 +08:00
owen
2f6092005b member: 佣金解冻 2023-09-05 18:59:24 +08:00
芋道源码
a58d7d63ed
!606 会员：分销佣金计算 
Merge pull request !606 from 疯狂的世界/brokerage
 2023-09-05 01:58:11 +00:00
owen
090058a2ba member: 佣金不冻结时，直接就是结算状态 2023-09-05 09:27:12 +08:00
owen
c7ef8519c8 member: 分销增加佣金 2023-09-05 08:56:39 +08:00
YunaiV
eae8218f0d 分佣：增加获得分销排行分页 API mock 2023-09-05 00:11:41 +08:00
YunaiV
7389e4fb65 分佣：增加获得分销记录分页 API mock 2023-09-04 22:48:26 +08:00
YunaiV
fc56a15f76 分佣：增加用户分销记录、提现 API mock 2023-09-04 21:00:03 +08:00
YunaiV
6a819da0b6 分佣：增加用户分销统计 API mock 2023-09-03 21:21:33 +08:00
owen
991b53649b member: 分销配置 2023-09-03 21:19:42 +08:00
YunaiV
4809e9b462 修复单元测试报错的问题 2023-09-03 18:28:29 +08:00
YunaiV
9148170926 调整 mapper 命名，避免可能的冲突 2023-09-02 19:23:09 +08:00
YunaiV
e6f1e5d968 同步最新商城演示图 2023-09-01 00:28:39 +08:00
YunaiV
5a788af084 购物车：简化 cart 表命名 2023-08-30 08:43:07 +08:00