Commit Graph

146 Commits (master)

Author SHA1 Message Date
tangqian c6240b23b5 fix: 订单列表根据商户名称和退款状态查询 2023-06-19 18:05:40 +08:00
tangqian e99801eddd fix:推广员导出 2023-06-16 13:03:56 +08:00
tangqian 3a9b7376f2 fix:推广员导出 2023-06-16 10:37:28 +08:00
tangqian 538daff555 fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己 2023-06-15 17:43:08 +08:00
tangqian 24467a92a6 fix: 修改 2023-06-09 18:24:13 +08:00
tangqian e1543fa85e fix: 修改 2023-06-09 17:09:49 +08:00
tangqian b5a83c9f33 fix: 修改 2023-06-09 17:03:39 +08:00
tangqian eca405b763 fix: 修改 2023-06-09 14:55:56 +08:00
tangqian 0d0623276b fix: 修改 2023-06-09 13:52:54 +08:00
tangqian c231870cad fix: 修改 2023-06-08 16:43:51 +08:00
tangqian acbce105f1 fix: 修改推广员 新增一个注册来源 2023-06-08 15:58:57 +08:00
tangqian 0ff7ebece8 fix: 修改推广员 新增一个注册来源 2023-06-08 15:51:57 +08:00
tangqian d471605d9b fix: 新增推广员注册来源 2023-06-07 14:48:47 +08:00
tangqian d357ce42ea fix: 新增推广员注册来源 2023-06-07 09:45:02 +08:00
perry 6d93d5ca16 推广员重复校验 2023-06-03 11:32:34 +08:00
tangqian cf897c2b9c fix: 修改部门 2023-06-01 18:46:06 +08:00
tangqian 2fc7ef07f8 fix: 修改部门 2023-06-01 13:26:31 +08:00
tangqian 236d4b566b fix: 修改部门 2023-06-01 12:02:45 +08:00
tangqian bec5e56add fix: 修改部门 2023-06-01 11:27:49 +08:00
tangqian 451747bd24 fix: 修改部门 2023-06-01 11:24:18 +08:00
tangqian 9f9cb30b03 fix: 修改后台相关 2023-05-31 17:29:24 +08:00
perry fe860b399a 租户数据权限 2023-05-30 10:59:55 +08:00
tangqian 678da4381a fix: 修改用户(update-user) 取消入参地址验证 2023-05-29 20:53:50 +08:00
tangqian 7709370ca5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
#	yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
2023-05-29 14:59:06 +08:00
tangqian 80937224e5 fix: 商城支付相关 2023-05-29 14:56:34 +08:00
perry 21790ab31d 分销数据统计 2023-05-29 09:46:14 +08:00
perry 4aadcef501 推广员导出 2023-05-28 11:36:55 +08:00
perry 2d5c8236c7 会员管理充值订单数据权限 2023-05-27 12:21:55 +08:00
perry c5a16c07f9 手机验证码登录即注册 2023-05-26 17:56:58 +08:00
perry e14b6608ef 后台报错 2023-05-26 13:45:46 +08:00
perry 8cfba0d856 商户id 2023-05-26 10:24:35 +08:00
tangqian 01a1e11f9b fix: 充值相关 2023-05-25 11:25:33 +08:00
perry b87a5d35a7 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
# Conflicts:
#	yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
2023-05-24 16:03:33 +08:00
tangqian 8a595cbef0 fix: 商城相关 2023-05-24 15:41:00 +08:00
tangqian c82b495ca5 fix: 修改判断用户是否被禁用 2023-05-24 14:12:43 +08:00
perry f1fbbcf36d 微信支付 2023-05-24 14:10:41 +08:00
tangqian 3582bdd395 fix: 修改判断用户是否被禁用 2023-05-24 11:02:32 +08:00
tangqian 3863a5a1d2 fix: 修改app获取用户信息 2023-05-23 17:21:26 +08:00
perry 0e3b3bf667 推广员 2023-05-23 10:34:09 +08:00
perry a6eb645d54 订单退款 2023-05-22 12:55:07 +08:00
perry 263ec59f24 微信支付 2023-05-19 18:25:00 +08:00
perry 04e0f33ad3 微信支付 2023-05-19 17:49:39 +08:00
tangqian 3a209f056b feat: 支付宝相关支付 2023-05-19 16:45:37 +08:00
perry 18909d4c2c 微信支付 2023-05-18 18:49:43 +08:00
perry 6fac2affcc 测试环境 2023-05-18 13:25:44 +08:00
perry 7870f79674 打包 2023-05-17 21:50:20 +08:00
perry 9fbee20579 推广员 2023-05-17 14:17:20 +08:00
perry 467c1dd402 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-17 09:32:22 +08:00
perry 8798b872e6 推广员导入 2023-05-17 09:32:13 +08:00
tangqian adcb6d26f2 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/user/MemberUserService.java
2023-05-16 18:19:55 +08:00