Commit Graph

272 Commits

Author SHA1 Message Date
sangelxiu1 bed0a3c6ac Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-07-18 13:27:25 +08:00
sangelxiu1 4aa420893f ## Opt - 增加奖衔值 2025-07-18 13:27:14 +08:00
cabbage 289dd4b1b7 ## 注册、升级送等级,兼容可以继续买(293); 2025-07-18 12:04:36 +08:00
cabbage 8f9c950d18 ## 邮费计算调整,所有商品都算在邮费里面; 2025-07-17 16:00:13 +08:00
cabbage 15da9da473 ## 188注册不能使用政策币; 2025-07-17 15:23:13 +08:00
cabbage 600c427aa8 ## 188注册不给660了; 2025-07-17 15:07:22 +08:00
cabbage 3075b241a8 ## 会员注册信息等级取结算等级(288); 2025-07-17 14:38:47 +08:00
cabbage 501ea3b1fa ## 自助注册转复购订单会员没删掉(287); 2025-07-17 14:26:14 +08:00
cabbage 550e7869a4 ## 退单报错同步284修改; 2025-07-17 14:07:32 +08:00
cabbage aab42daf4c ## 注册转复购撤单相关处理; 2025-07-16 12:04:15 +08:00
sangelxiu1 a65ac84227 Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-07-16 10:28:30 +08:00
sangelxiu1 62feb06a5d ## Opt - 拓展结余返回格式 2025-07-16 10:28:21 +08:00
cabbage 1fd65c2d5c ## 注册订单支付报错处理; 2025-07-16 09:31:39 +08:00
cabbage a96b70939e ## 顾客不计算奖金不会获得奖金; 2025-07-15 18:07:38 +08:00
cabbage 8833f062e6 ## 顾客注册订单最终保存时为复购订单; 2025-07-15 17:21:27 +08:00
cabbage 7e96970223 ## 去掉乐学涉及的奖项、法宝券等; 2025-07-15 17:04:43 +08:00
cabbage 9d750ff7fc ## 报单添加购买188送VIP处理; 2025-07-15 16:14:40 +08:00
sangelxiu1 408690ca79 ## Opt - 增加回调中支付通道流水号 2025-07-14 13:47:48 +08:00
cabbage f639da7150 ## 北大去掉进销存;去掉企业风采等; 2025-07-11 10:48:06 +08:00
cabbage 1234620b50 ## 商品权限控制调整;去掉部分国际化; 2025-07-10 17:37:38 +08:00
sangelxiu1 2d54006d23 ## Feat - 驳回后返还金额 2025-07-08 17:35:00 +08:00
sangelxiu1 ccfb95d718 ## Feat - 提现不验证银行卡&默认赋值0 2025-07-08 16:39:56 +08:00
sangelxiu1 979f541192 ## Feat - 提现驳回 2025-07-08 15:49:18 +08:00
cabbage 949077725a ## 去掉发货和进销存的依赖; 2025-07-07 17:55:03 +08:00
sangelxiu1 df62c304d7 ## Opt - 退款明细 2025-07-05 15:49:21 +08:00
cabbage 7ccef120e2 ## 在线支付退款位置调整;北大分支隐藏乐学相关专区; 2025-07-03 17:34:25 +08:00
sangelxiu1 7e93ed352f Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-07-03 17:02:47 +08:00
sangelxiu1 d91e55ae7c ## Opt - 优化支付类型判断&实际提交在线退款逻辑延后 2025-07-03 17:02:38 +08:00
cabbage 68a2290fae Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-07-03 16:04:26 +08:00
cabbage 2f78a8a7d4 ## 去掉续约相关逻辑; 2025-07-03 16:04:20 +08:00
sangelxiu1 0c086a4e23 ## Opt - 查询注册用户优化处理 2025-07-03 16:02:38 +08:00
woody 429c39a435 feat(CuMemberVO): 会员列表导出字段调整 2025-07-03 14:40:13 +08:00
sangelxiu1 4b201e7421 ## Feat - 京东银行卡支付(member/sale/third) 2025-07-03 14:38:57 +08:00
cabbage 6c3cb2caa5 ## 商品指定某个会员可见; 2025-07-03 13:36:15 +08:00
cabbage c5cd6a5485 Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-06-26 15:13:30 +08:00
cabbage 2dcf0d987a ## 枚举返回国际化处理; 2025-06-26 15:13:24 +08:00
sangelxiu1 a781afc437 Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-06-26 14:54:16 +08:00
sangelxiu1 919d626661 ## Feat - 姓名编号脱敏(会员不脱敏) 2025-06-26 14:54:05 +08:00
cabbage d16afeba70 ## 去掉部分不需要实体; 2025-06-26 14:37:25 +08:00
sangelxiu1 3e8834ba6e ## Feat - 3个月前的数据不可见&姓名编号脱敏 2025-06-26 10:57:58 +08:00
sangelxiu1 fca7ae9c4e ## Opt - H5个人拓展结余接口 - 千位分隔符 2025-06-26 09:53:18 +08:00
sangelxiu1 71695f09aa ## Opt - H5个人拓展结余接口 - 千位分隔符 2025-06-26 09:30:31 +08:00
sangelxiu1 39e3c584e0 ## Opt - H5个人拓展结余接口 - 大小区规则 2025-06-25 10:42:17 +08:00
sangelxiu1 d3d416d377 ## Feat - H5个人拓展结余接口 2025-06-25 09:20:40 +08:00
woody d50cbd5f97 feat(CuMemberBonusController): 奖金汇总导出字段调整 2025-06-17 16:15:34 +08:00
cabbage d99483aabd ## 奖金明细空数据导出报错处理; 2025-06-17 14:03:47 +08:00
cabbage e3882bea09 ## 奖金明细同步列表字段;调整排序; 2025-06-17 13:57:14 +08:00
cabbage 08bf64fb0c ## 商品详情添加体系字段;调整字段注释; 2025-06-17 13:42:46 +08:00
woody 1448262750 feat(CuBonusVertexStatisVo): 零线系统拨比导出列表字段调整 2025-06-17 13:41:44 +08:00
woody 8f2c1c7c81 feat(order): 商品订单及订单详情添加隶属体系字段 2025-06-17 11:14:09 +08:00
cabbage 89ee27cb2e ## 奖金拨比汇总服务补贴恢复; 2025-06-11 14:08:38 +08:00
cabbage e86610e2a2 Revert "## 奖金拨比汇总服务补贴拨比调整,不算升级;"
This reverts commit 389d0684
2025-06-11 14:08:01 +08:00
cabbage efa65c3ba9 ## 奖金拨比汇总服务补贴恢复; 2025-06-11 14:04:54 +08:00
cabbage 389d068466 ## 奖金拨比汇总服务补贴拨比调整,不算升级; 2025-06-11 09:24:56 +08:00
cabbage 5c458c71be ## 商品列表返回封面图;去掉商品列表图片轮播; 2025-06-06 18:04:40 +08:00
cabbage a6ee758940 ## 撤注册单,如果有政策币或重消币,不能撤(148);优化部分注释和方法; 2025-06-05 10:26:07 +08:00
cabbage 95a3c1edc8 ## 导入发货表头修改; 2025-06-04 14:21:16 +08:00
cabbage 3472c82cb9 ## 统计分析下伞下安置、直推新増业绩优化; 2025-06-03 16:00:03 +08:00
cabbage 55277a539c ## 统计分析下会员升级记录(142),真实奖衔分析,伞下直推,伞下账户余额查询优化处理; 2025-06-03 15:03:36 +08:00
cabbage 7f0eda7773 ## 仓储导出格式调整; 2025-06-03 13:33:35 +08:00
cabbage 6703b159b5 ## 仓储导出格式调整; 2025-06-03 11:43:50 +08:00
cabbage f9b7a07ee4 ## 仓储导出格式调整; 2025-06-03 11:25:03 +08:00
cabbage 49260b4049 ## 会员信息导入报错处理; 2025-06-03 11:18:09 +08:00
cabbage fe249564d2 ## 新商品列表接口添加入参处理; 2025-06-03 10:21:25 +08:00
cabbage 03511f1b1a ## 调整数据报表查询; 2025-05-31 10:48:16 +08:00
cabbage 2c45f1117c ## 调整专区商品列表显示; 2025-05-30 17:27:07 +08:00
cabbage 70034153c2 ## 首页商品新接口; 2025-05-30 16:41:14 +08:00
cabbage 07e685eff1 ## 新广告banner接口; 2025-05-30 13:58:27 +08:00
cabbage 46dbaf3412 ## 公告去掉不需要的逻辑以及代码 ; 2025-05-30 11:43:34 +08:00
cabbage c5cf7ec1e5 ## 优化去掉部分不使用接口和定时任务; 2025-05-30 10:35:22 +08:00
cabbage 502576abcb ## 复购拨比计算时,不加处重消; 2025-05-29 16:27:30 +08:00
cabbage 7848b05e46 ## 兼容1:2新拓展收益,计算首购复购比例; 2025-05-29 15:28:31 +08:00
cabbage 03d8f8572b ## 数据报表调整代码格式以及写法; 2025-05-29 09:56:32 +08:00
cabbage f0b1a12181 ## 拨比列表数据调整(129); 2025-05-29 09:02:40 +08:00
cabbage b156eb5faa ## 查询活动列表语句调整; 2025-05-28 17:08:44 +08:00
cabbage 2ea04570e5 ## 购票活动不校验时间是否有相同的; 2025-05-28 16:52:29 +08:00
cabbage 470efd23b6 ## 调整导出顺序; 2025-05-28 14:54:42 +08:00
cabbage 230a3fa2cd ## 购票列表语句调整;调整部分代码格式; 2025-05-28 14:21:14 +08:00
woody ba5959d860 feat(SaTicketVO): 我的门票-门票价格保留两位小数 2025-05-28 11:33:30 +08:00
cabbage 446b1b5a60 ## 商品列表价格改为2位小数; 2025-05-28 10:38:08 +08:00
cabbage a2c70129e9 ## 恢复客商类型枚举接口; 2025-05-27 18:08:14 +08:00
cabbage 618fc578eb ## 我的门票支持分页; 2025-05-27 17:12:54 +08:00
cabbage 0a29fd2f1e ## 购票会员端接口修改; 2025-05-27 16:33:14 +08:00
cabbage b7d9d85ede ## 购票相关接口迁移; 2025-05-27 15:50:44 +08:00
cabbage 9dbea1f00b ## 找回部分接口; 2025-05-27 11:48:22 +08:00
cabbage 6d16a3f2e2 ## 户籍变更改为会员端直接修改不需要后台审核; 2025-05-26 16:57:44 +08:00
cabbage 03d5f2592b ## 修改地址去掉不需要的接口; 2025-05-26 11:39:07 +08:00
cabbage 2c3b7887e7 ## 合并代码补全信息; 2025-05-26 10:57:15 +08:00
cabbage 8e53d51867 ## 会员顶点拨比统计包含顶点自己; 2025-05-26 10:41:34 +08:00
cabbage 16e913e987 ## 看板不统计空单数据; 2025-05-26 10:41:32 +08:00
cabbage a09dee575a ## 三个拨比列表修改; 2025-05-26 10:41:28 +08:00
cabbage 39a547a5c6 ## 顶点奖金拨比列表统计处理; 2025-05-26 10:41:25 +08:00
cabbage 0efe32a294 ## 辅导收益添加小区月度新増业绩配置; 2025-05-26 10:40:14 +08:00
cabbage 39d5ea1509 ## 去掉部分不用接口及功能; 2025-05-26 10:39:57 +08:00
cabbage e440e1187c ## 去掉微信、支付宝官方支付;去掉京东支付;去掉图片、视频压缩依赖包引入; 2025-05-26 10:31:27 +08:00
cabbage 7b9a4073dc ## 去除部分不需要内容; 2025-05-26 10:31:17 +08:00
cabbage 9fcf728a99 ## 看板充值数据排序; 2025-05-26 10:31:10 +08:00
cabbage e36e9e88fd ## 去除部分不需要内容; 2025-05-26 10:31:01 +08:00
woody 5ebb612889 fix(SaOrderItemsMapper): 订单详情页面-修复systemType导致的报错 2025-05-26 10:00:53 +08:00
woody 9ee41601b7 feat(Deliver-Sale): 发货清单立即发货列表移除系统类型字段 2025-05-26 10:00:53 +08:00