Commit Graph

33 Commits

Author SHA1 Message Date
liuyingfang ae628adba4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java
#	pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml
#	pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/PromoterMainPageServiceImpl.java
2023-07-21 19:33:56 +08:00
liuyingfang d4fe97d570 推广部分大改 2023-07-21 19:30:00 +08:00
韩鹏辉 994eb1a754 修改分佣 2023-07-21 19:25:55 +08:00
liuyingfang b92f72b53e 替换收银呗字样,更改创客错误状态,更改提现时手机号显示,分享注册,提现算法列表,后台推广员列表补充推送 2023-07-18 15:37:00 +08:00
liuyingfang 0a7da333b2 替换收银呗字样,更改创客错误状态,更改提现时手机号显示,分享注册,提现算法列表,后台推广员列表· 2023-07-18 15:34:44 +08:00
韩鹏辉 d47550f8df 升级创客 2023-07-10 17:14:18 +08:00
韩鹏辉 967487e89c 修改提现记录 2023-07-06 18:01:32 +08:00
liuyingfang a473fd6457 D1D0数据同步,提现审核相关 2023-07-06 17:01:21 +08:00
liuyingfang dfa5c6670f 银盛D1相关,提现部分改动,注册逻辑更改,后台切换通道 2023-07-05 17:01:33 +08:00
liuyingfang 8e0583b460 支付宝认证,切换支付通道新逻辑,后台切换列表,推广三张图详情,关闭向充值服务请求, 2023-07-01 11:53:01 +08:00
liuyingfang fe7e9f2074 增加角色相关,进件相关修改,后台增加用户默认通道,前台默认通道 2023-06-28 10:05:28 +08:00
liuyingfang c68b1919b5 增加实体类,以及部分逻辑修改 2023-06-26 09:19:40 +08:00
liuyingfang d5b9107c6e 小程序店铺相关 2023-06-17 14:39:54 +08:00
韩鹏辉 f864f69d03 Merge remote-tracking branch 'origin/master' 2023-06-14 16:07:12 +08:00
韩鹏辉 c1f8056629 添加pos 机退款接口 2023-06-14 16:06:34 +08:00
liuyingfang 70ae3a3420 实名唯一性判断,进件微小改动 2023-06-13 17:49:46 +08:00
hankaikai c29c10c193 "拉卡拉进件支付代码" 2023-06-01 17:14:02 +08:00
hankaikai 6f6938daa4 "拉卡拉进件支付代码" 2023-05-25 11:02:39 +08:00
hankaikai e32605226d "设备" 2023-05-24 18:06:02 +08:00
hankaikai e9a17e300a "设备" 2023-05-24 14:16:39 +08:00
hankaikai b7793fe1ff "设备规格修改" 2023-05-23 11:38:33 +08:00
hankaikai a1b23f7104 "设备规格修改" 2023-05-09 10:27:15 +08:00
lyf a5db6104bb 银盛相关所有 2023-04-07 14:01:27 +08:00
lyf a3e96fa81a 后台将收银呗改为快银 2023-03-31 10:49:43 +08:00
zhujunshuai c03ec8d1dc 增加生产环境配置 2023-02-24 14:17:22 +08:00
lyf ca958158db 收款、余额、账单、收银点 2023-02-14 09:14:13 +08:00
lyf ff900668b2 '认证相关对接差不多' 2023-02-09 14:10:51 +08:00
zhujunshuai a0d5f0fb3c update 2023-02-02 16:46:35 +08:00
zhujunshuai 9a0b839abe delete 2023-01-29 14:22:32 +08:00
lyf 76c4265134 更改发送短信, 2023-01-28 17:21:04 +08:00
lyf b017339f5f 更改配置 2023-01-28 15:57:27 +08:00
lyf e1ff6a0eb7 更改部分配置问题 2023-01-28 15:43:04 +08:00
junshuai 62548736a7 add file 2022-07-23 13:54:07 +08:00