angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity
99 Commits 4 Branches 0 Tags 11 MiB
Commit Graph

75 Commits

Author SHA1 Message Date
cabbage 8eebb3fdfa ## 奖金明细、奖金汇总接口调整； 2025-06-13 14:22:05 +08:00
sangelxiu1 dc70bc6db7 ## Opt - 我的->盒数 
业绩除万,四位小数
 2025-06-13 14:22:01 +08:00
cabbage c589c2461c ## 计算平级时，保留6位小数； 2025-06-13 14:22:00 +08:00
cabbage 99317636cc ## 查询昨日奖金汇总接口； 2025-06-13 14:21:58 +08:00
sangelxiu1 fea41d6ccd ## Opt - 我的->盒数 
增加激活时间判断 & 计算达小区时包含注水,返回前台数据时剔出注水
 2025-06-13 14:21:56 +08:00
sangelxiu1 3873adb2cd ## Fix - 新用户后台改等级 没有日结造成npe 2025-06-13 14:21:54 +08:00
cabbage d2188ab2b0 ## 后台办理业务手动激活推送秒结状态MQ； 2025-06-13 14:18:04 +08:00
sangelxiu1 1f8d4a2b50 ## Feat - 新增秒结补偿MQ逻辑 
查当前ID伞下秒结表的sum(NEW_BOX_NUM)更新至当前用户的TEAM_NEW_BOX_NUM
 2025-06-13 14:17:06 +08:00
cabbage dcead29539 ## 后台办理业务手动激活推送秒结状态MQ； 2025-06-13 14:17:04 +08:00
cabbage 44e36f5abe ## 升级订单添加激活MQ推送； 2025-06-13 14:17:02 +08:00
cabbage 896597ac53 ## get-info返回是否激活； 2025-06-13 14:16:58 +08:00
woody 3b87d98457 feat(MemberEmptyService): 空单注册不校验手机号 2025-06-13 14:16:56 +08:00
cabbage 849f8e6128 ## 结算时处理手动激活的数据处理； 2025-06-12 20:40:22 +08:00
sangelxiu1 ccec401f84 ## Fix - 查询区域偶发带分页&查询会员盒数 2025-06-12 20:40:22 +08:00
cabbage c95d15489b ## 秒结、日结处理会员激活状态； 2025-06-12 20:40:21 +08:00
cabbage fe382acca8 ## 直推收益、平级收益处理； 2025-06-12 15:23:13 +08:00
sangelxiu1 9f8b77867c ## Opt - 重构统计盒数逻辑 2025-06-12 15:23:12 +08:00
cabbage ec0006a40c ## 直推收益、平级收益处理； 2025-06-12 15:23:12 +08:00
cabbage 564fb2bf12 ## 区域收益改为商品价格的5%；盒数大小区计算调整；秒结计算等级以会员表关系为主查询； 2025-06-12 13:29:33 +08:00
woody 69fce5f8bd feat(CuMember): 直推列表添加手机号字段 2025-06-12 13:29:33 +08:00
cabbage 66973a5675 ## 注册、升级、复购、重消订单业绩、盒数都算自己小区； 2025-06-11 19:30:51 +08:00
cabbage 572b0caf54 ## 升级订单等级计算处理； 2025-06-11 16:56:58 +08:00
cabbage 5778ca1429 Merge remote-tracking branch 'origin/dev' into test 2025-06-11 16:29:58 +08:00
cabbage 68827b97f2 ## 撤单激活处理（168）； 2025-06-11 16:28:57 +08:00
cabbage e8bba0ae80 ## 门票价格显示（169）； 2025-06-11 16:25:55 +08:00
cabbage a687acd4f3 ## 注册成功返回地址； 2025-06-11 16:20:17 +08:00
cabbage 78c9b8d038 ## 升级方式改为一次性补差升级； 2025-06-11 16:11:50 +08:00
cabbage 5cedaa4f2e ## 撤单处理盒数、业绩等； 2025-06-11 15:39:32 +08:00
sangelxiu1 eb34a8eea9 Merge remote-tracking branch 'origin/dev' into dev 2025-06-11 14:38:46 +08:00
sangelxiu1 279a17cf1e ## Opt - 选择收益区域 2025-06-11 14:38:39 +08:00
cabbage 190c8b3c9d ## 处理语句报错； 2025-06-11 14:03:39 +08:00
cabbage ffc688d029 ## 区域分红收益处理； 2025-06-11 13:49:11 +08:00
cabbage 11496f140d ## 报单时激活判断调整；还原指定商品盒数累计； 2025-06-11 11:58:28 +08:00
cabbage 75ad4f97a3 ## 报单时激活判断调整；还原指定商品盒数累计； 2025-06-11 11:57:21 +08:00
sangelxiu1 968175db54 ## Opt - 非空验证. 2025-06-11 11:06:59 +08:00
cabbage 2c7178172d ## 调整生成奖金索引； 2025-06-11 11:06:27 +08:00
cabbage 622a066e0f Merge remote-tracking branch 'origin/dev' into dev 2025-06-11 11:05:29 +08:00
cabbage 438f4b2cf3 ## 调整生成奖金索引； 2025-06-11 11:05:25 +08:00
sangelxiu1 7f031633f4 Merge remote-tracking branch 'origin/dev' into dev 2025-06-10 20:34:00 +08:00
sangelxiu1 db5cf31ffc ## Opt - 非空验证. 2025-06-10 20:33:54 +08:00
cabbage 424e0bd18c Merge remote-tracking branch 'origin/dev' into test 
# Conflicts:
#	bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java
#	bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBonusItemsServiceApi.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailRangeServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberAchieveMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAwardsMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
#	bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java
#	bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwardsType.java
 2025-06-10 20:32:18 +08:00
cabbage 7e20c1d0ed ## 秒结和日结中盒数、业绩上传处理；等级、奖衔计算处理； 2025-06-10 20:31:14 +08:00
cabbage 07d9dcc558 Merge remote-tracking branch 'origin/dev' into dev 2025-06-10 17:58:30 +08:00
cabbage ee155ff59b ## 注册升级购买指定商品，则会员为激活； 2025-06-10 17:58:23 +08:00
sangelxiu1 b0cc64ade4 ## Opt - 户籍变更->万能验证码 2025-06-10 17:50:50 +08:00
sangelxiu1 46488c8128 ## Opt - 删除获取订单状态接口 2025-06-10 17:14:06 +08:00
cabbage fdbe598eb4 ## 秒结等级、奖衔处理，业绩、盒数上传处理；部分枚举替换； 2025-06-10 15:45:29 +08:00
cabbage 17106259ff ## 升级订单处理等级返回调整； 2025-06-10 15:45:28 +08:00
cabbage 933056496c ## 升级订单撤单处理逻辑调整； 2025-06-10 15:45:28 +08:00
cabbage d69566eeef ## 秒结等级、奖衔处理，业绩、盒数上传处理；部分枚举替换； 2025-06-10 15:45:02 +08:00