Compare commits

...

148 Commits

Author SHA1 Message Date
chengkun ca9020b63d hotfix:处理PC端登录不了的BUG 3 years ago
chengkun 5fb730474f hotfix:完善微信用户、快手用户id、密钥配置 3 years ago
chengkun 7814465f34 hotfix:移除多余空格 3 years ago
chengkun 34f3bc257f hotfix:移除bnyer-ai模块 3 years ago
Penny e5d4bddffc feature:统一修改处理,增添妙鸭壁纸 3 years ago
Penny 2cca88e8e4 hotfix:统一平台编码 3 years ago
Penny 60ccdea56b hotfix:统一平台编码 3 years ago
Penny b43b84ee64 feature:添加flagStudio方法 3 years ago
wuxicheng a6a3ba514d 添加spring重试 3 years ago
wuxicheng 950f8edf7e 添加spring重试 3 years ago
wuxicheng 86087442e6 优化mq重复消费处理 3 years ago
wuxicheng 4879adf524 暂时屏蔽订单推送 3 years ago
Penny 91d2ab2f3e feature:添加微信端签到方法 3 years ago
wuxicheng 286f3eef54 mq优化,支付请求添加重试机制,统一异常管理,并添加统一订单推送 3 years ago
wuxicheng 7888562f60 mq优化,支付请求添加重试机制,统一异常管理,并添加统一订单推送 3 years ago
wuxicheng 8d438644ef 优化 3 years ago
wuxicheng d2b2b5f49e bug处理,去掉缓存 3 years ago
wuxicheng 721b71505a Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev 3 years ago
wuxicheng a4539275ae 优化 3 years ago
Penny 09cf92ef18 feature:修改查询艺术家图片展示不是最新的sql 3 years ago
wuxicheng 8c23ebeae7 优化 3 years ago
wuxicheng 0cdfa32ff4 优化 3 years ago
wuxicheng 2e1eeb2852 优化 3 years ago
wuxicheng d781dfcc1e 解决季度时间换算问题,消息记录优化 3 years ago
wuxicheng a7973cd9b4 解决季度时间换算问题 3 years ago
wuxicheng b10482c0f1 添加订单缓存 3 years ago
wuxicheng 813ed393b2 Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev 3 years ago
wuxicheng 40d7454008 防重复提交bug修复 3 years ago
‘‘ 2ca382d399 feature:修改订单、支付服务为内网地址 3 years ago
Penny c01ce8d8ec feature:修改order、pay正式环境链接地址 3 years ago
Penny 2896cd7dc7 feature:fixbug 3 years ago
Penny a8b69a7206 feature:fixbug 3 years ago
Penny 699c4c6f3a Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev 3 years ago
Penny 42336a4efd feature:添加定时任务 3 years ago
wuxicheng 6039d4e3ce 消息表增加返回主题 3 years ago
wuxicheng a90e43c27b Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev 3 years ago
wuxicheng ddf250e1a0 消息表增加返回主题 3 years ago
Penny 45965105a3 feature:添加定时任务 3 years ago
Penny 6cb1455447 feature:添加定时任务 3 years ago
wuxicheng fa8f52ed30 优化 3 years ago
wuxicheng 455679b591 bug处理 3 years ago
wuxicheng c8ba25be7c Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev 3 years ago
wuxicheng 351fbf497f 消息id调整,避免出现重复 3 years ago
Penny 99b4d29d78 feature:添加签到功能、看广告获取画意值功能 3 years ago
wuxicheng 30e9be25d8 优化调整 3 years ago
wuxicheng f907768ceb 优化调整 3 years ago
wuxicheng dbe3a94ee2 优化调整 3 years ago
wuxicheng 482689abe4 调整 3 years ago
wuxicheng 51b27ac6d8 添加支付服务、img本地消息表 3 years ago
wuxicheng fdf88febb4 bug修复 3 years ago
wuxicheng dd3e09307b bug修复 3 years ago
wuxicheng aa9369d03c bug修复 3 years ago
wuxicheng 0dc846ed95 bug修复 3 years ago
wuxicheng 8642f365ea bug修复 3 years ago
wuxicheng c085a738f7 bug修复 3 years ago
wuxicheng d72a7a641e 实现本地消息表消息补偿,消息去重 3 years ago
wuxicheng f4edcac125 实现本地消息表消息补偿,消息去重 3 years ago
wuxicheng 79809b41eb 实现本地消息表消息补偿,消息去重 3 years ago
wuxicheng 96f5b122d0 实现本地消息表消息补偿,消息去重 3 years ago
wuxicheng b8b05db310 实现本地消息表消息补偿,消息去重 3 years ago
wuxicheng e44d822df1 Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev 3 years ago
wuxicheng 7a973f8e2d 实现本地消息表消息补偿,消息去重 3 years ago
Penny b9ca404153 feature:添加获取绘画奖励、下载次数方法 3 years ago
wuxicheng c7a5d3d717 消息补偿 3 years ago
wuxicheng 31fbcb5a34 会员记录bug处理 3 years ago
wuxicheng 0fc85eb32c 同步会员到期状态 3 years ago
wuxicheng c5f16daf63 优化会员记录逻辑 3 years ago
wuxicheng 0de63da19b bug处理 3 years ago
wuxicheng 2ee5c68867 Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev 3 years ago
wuxicheng af3f10ace2 bug处理 3 years ago
Penny daec2c3205 feature:fixbug 3 years ago
Penny 697574f323 feature:img修改为dev环境 3 years ago
Penny 13ff48c720 feature:添加画意值奖励mq 3 years ago
wuxicheng 7c2eeb6288 bug处理 3 years ago
wuxicheng cb72a8b3bb 添加mq配置增强 3 years ago
wuxicheng f2da6fccbe mq统一改为异步发送 3 years ago
wuxicheng bb2bda0560 bug处理 3 years ago
wuxicheng 99b33b8528 bug处理 3 years ago
wuxicheng 3a8ac0ab71 bug处理 3 years ago
wuxicheng 5c7adb8889 bug处理 3 years ago
wuxicheng b1b362cfa4 Merge remote-tracking branch 'origin/feature-1.1-bnyer-order' into feature-1.1-dev 3 years ago
wuxicheng 98710c3223 bug处理 3 years ago
Penny 9740d23b72 feature:观看广告次数上限提高到10次 3 years ago
Penny 58155f95ff feature:新增写入收益获得画意值方法、绘画写入画意消耗记录方法 3 years ago
Penny 571a801aa3 feature:画图方法添加画意值消耗逻辑、添加获取画意值方法 3 years ago
‘‘ 76a897ba07 feature:移除不必要的依赖头 3 years ago
Penny 0bffdadead feature:json序列化统一处理 3 years ago
Penny d734c86b9d Merge remote-tracking branch 'origin/feature-1.1-bnyer-order' into feature-1.1-dev 3 years ago
Penny 3dae669e3c fix:修复订单号长度问题,暂时注释防重复提交 3 years ago
Penny 27ad05e5cf Merge remote-tracking branch 'origin/feature-1.1-bnyer-order' into feature-1.1-dev 3 years ago
Penny 5c4ebfecff fix:修复订单号长度问题,暂时注释防重复提交 3 years ago
Penny a28996ee99 Merge remote-tracking branch 'origin/feature-1.1-bnyer-order' into feature-1.1-dev 3 years ago
Penny daf16667f4 fix:bug 3 years ago
wuxicheng 0dc3fc2def 微信退款 3 years ago
wuxicheng a13cce8449 防重复提交调整 3 years ago
wuxicheng 55a683a11e 防重复提交调整 3 years ago
Penny 00f881cd7f feature:修改兑换画意值接口,取消AI绘画次数缓存统计、添加查看画意值、意心使用记录接口 3 years ago
Penny 70bc69dffb feature:修正上传常量 3 years ago
Penny 1e5260a1bc feature:添加画意值、意心功能 3 years ago
Penny 9f4591cf4f feature:bnyer-file测试环境 3 years ago
Penny e528d858e2 feature:新增情侣头像接口 3 years ago
Penny a145878e2c Merge remote-tracking branch 'origin/feature-1.1-bnyer-order' into feature-1.1-dev 3 years ago
Penny 1e40bb5b61 feature:修正提交未处理手续费的情况;获取绘画者ai绘画详情接口名称调整 3 years ago
wuxicheng 0f2ce5f744 查询用户会员记录 3 years ago
wuxicheng 8e094cf2ea 查询用户会员记录 3 years ago
wuxicheng c1a7cc27d1 查询用户会员记录 3 years ago
wuxicheng 6081e56042 查询用户会员记录 3 years ago
wuxicheng 59690f7c8c 添加防重复提交功能 3 years ago
wuxicheng 88caf1747a 支付服务统一退款添加退款前签名校验,保证资金安全 3 years ago
wuxicheng 7b293cde78 微信支付下单调整完成 3 years ago
‘‘ 39f92b1b4e Merge remote-tracking branch 'remotes/origin/feature-1.1-bnyer-order' into feature-1.1-dev 3 years ago
‘‘ 72c864bb82 feature:情侣头像模式添加 3 years ago
wuxicheng 01112667bb 支付工厂构造私有化 3 years ago
wuxicheng 5a75e93f03 代码优化 3 years ago
Penny c807390af9 Merge remote-tracking branch 'origin/feature-1.1-bnyer-order' into feature-1.1-dev 3 years ago
Penny 48607529f8 feature:新增创意工坊详情接口 3 years ago
Penny 49e3adc881 Merge remote-tracking branch 'origin/feature-1.1-bnyer-order' into feature-1.1-dev 3 years ago
wuxicheng 77516afa82 代码优化 3 years ago
wuxicheng 3dd6a73ddc 代码优化 3 years ago
wuxicheng 1a62ed968f 代码优化 3 years ago
Penny 0122a676e9 feature:文件上传api更新feign方法;文生图接口增加高级参数功能 3 years ago
wuxicheng 7bc766fcf4 代码优化 3 years ago
wuxicheng 42446ffcf8 Merge branch 'feature-1.1-dev' into feature-1.1-bnyer-order 3 years ago
wuxicheng 44a3aa01d4 Merge branch 'feature-1.1-dev' into feature-1.1-bnyer-order 3 years ago
wuxicheng 5b48a75798 支付优化 3 years ago
Penny 801e208132 处理通用获取用户信息方法 3 years ago
wuxicheng f2d66a19b2 支付优化 3 years ago
wuxicheng 6fdd866d28 支付优化 3 years ago
Penny b369d81f88 header处理获取用户信息数据 3 years ago
Penny b040590358 Merge branch 'feature-1.1-bnyer-order' into feature-1.1-dev 3 years ago
wuxicheng bb1210b29e 优化 3 years ago
wuxicheng 216c86cce6 添加统一订单查询 3 years ago
wuxicheng a80483de96 添加order接口模块 3 years ago
wuxicheng aaeec20300 修改orderId字段,避免字段名歧义 3 years ago
wuxicheng f610ac3c18 设置下单openid 3 years ago
wuxicheng 9694bef682 Merge remote-tracking branch 'origin/feature-1.1' into feature-1.1-bnyer-order 3 years ago
wuxicheng 308c2967ae 优化下单支付相关内容 3 years ago
wuxicheng 542f4207d2 添加抖音、快手支付 3 years ago
wuxicheng edff449a3b 订单修改后添加会员记录逻辑优化 3 years ago
wuxicheng 4d660f6367 调整 3 years ago
wuxicheng b9f71f6eab Merge remote-tracking branch 'origin/feature-1.0-img' into feature-1.1-bnyer-order 3 years ago
wuxicheng 3d2efc73ac 调整 3 years ago
wuxicheng 7bac5c34ef 支付服务添加回调接口 3 years ago
wuxicheng f5e72cc6b2 支付服务添加回调接口 3 years ago
wuxicheng 9d5e186059 支付服订单服务相关接口优化调整 3 years ago
wuxicheng 5e763f0018 添加支付服务统一下单接口 3 years ago
wuxicheng 8aab2b6fec 订单业务代码提交 3 years ago
wuxicheng 1a34ca17ad 订单业务代码提交 3 years ago
  1. 12
      bnyer-api/bnyer-api-file/src/main/java/com/bnyer/file/api/RemoteFileService.java
  2. 7
      bnyer-api/bnyer-api-file/src/main/java/com/bnyer/file/api/factory/RemoteFileFallbackFactory.java
  3. 2
      bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteImgFallbackFactory.java
  4. 33
      bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteWxMiniFallbackFactory.java
  5. 2
      bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteImgService.java
  6. 24
      bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteUserVipService.java
  7. 63
      bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/UserVipVo.java
  8. 4
      bnyer-api/bnyer-api-img/src/main/resources/META-INF/spring.factories
  9. 26
      bnyer-api/bnyer-api-order/pom.xml
  10. 26
      bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/bean/query/VipOrderExtQuery.java
  11. 23
      bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/bean/query/VipOrderQuery.java
  12. 61
      bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/bean/vo/VipOrderVo.java
  13. 42
      bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/factory/RemoteVipOrderFallbackFactory.java
  14. 36
      bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/remote/RemoteVipOrderService.java
  15. 2
      bnyer-api/bnyer-api-order/src/main/resources/META-INF/spring.factories
  16. 4
      bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/RemoteSystemFileService.java
  17. 4
      bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/factory/RemoteSystemFileFallbackFactory.java
  18. 2
      bnyer-api/bnyer-api-system/src/main/resources/META-INF/spring.factories
  19. 1
      bnyer-api/pom.xml
  20. 36
      bnyer-auth/src/main/java/com/bnyer/auth/config/JsonConfig.java
  21. 24
      bnyer-auth/src/main/java/com/bnyer/auth/serializer/LongToStringSerializer.java
  22. 4
      bnyer-auth/src/main/java/com/bnyer/auth/service/CreatorLoginService.java
  23. 4
      bnyer-auth/src/main/java/com/bnyer/auth/service/FhUserLoginService.java
  24. 6
      bnyer-auth/src/main/java/com/bnyer/auth/service/TiktokUserLoginService.java
  25. 6
      bnyer-auth/src/main/java/com/bnyer/auth/service/WxUserLoginService.java
  26. 11
      bnyer-common/bnyer-common-core/pom.xml
  27. 351
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/annotation/CustomParamsValidation.java
  28. 63
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/annotation/LimitRepeatRequest.java
  29. 30
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/RedisKeyConstant.java
  30. 5
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/SecurityConstants.java
  31. 10
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/ServiceNameConstants.java
  32. 10
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/TiktokConstant.java
  33. 68
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java
  34. 77
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AlipayConfig.java
  35. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Banner.java
  36. 80
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseMqMessage.java
  37. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java
  38. 11
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CdkLog.java
  39. 4
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java
  40. 58
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/DiamondLog.java
  41. 69
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/DypayConfig.java
  42. 4
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Feedback.java
  43. 23
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/FhUser.java
  44. 57
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/GoldLog.java
  45. 19
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgMqMessageRecord.java
  46. 62
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/KspayConfig.java
  47. 19
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/OrderMqMessageRecord.java
  48. 11
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintCdk.java
  49. 222
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PayInfo.java
  50. 19
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PayMqMessageRecord.java
  51. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java
  52. 4
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java
  53. 26
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/R.java
  54. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java
  55. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java
  56. 21
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokUser.java
  57. 30
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVip.java
  58. 50
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java
  59. 134
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java
  60. 30
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipType.java
  61. 15
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java
  62. 23
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WxUser.java
  63. 105
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WxpayConfig.java
  64. 37
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java
  65. 6
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AiPaintPageDto.java
  66. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java
  67. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerPageDto.java
  68. 83
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BaseDto.java
  69. 4
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java
  70. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java
  71. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitPageDto.java
  72. 4
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java
  73. 21
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/DiamondLogPageDto.java
  74. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackPageDto.java
  75. 6
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhLoginDto.java
  76. 26
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/GeneratePaintCdkDto.java
  77. 31
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/GetGoldDto.java
  78. 21
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/GoldLogPageDto.java
  79. 6
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintCdkUseDto.java
  80. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PayUserVipDto.java
  81. 4
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java
  82. 4
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderInsertDto.java
  83. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java
  84. 28
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgDto.java
  85. 41
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgLoveDto.java
  86. 4
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokLoginDto.java
  87. 2
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java
  88. 5
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java
  89. 5
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxLoginDto.java
  90. 6
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java
  91. 25
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumAppType.java
  92. 22
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumMessageStatus.java
  93. 18
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumMessageType.java
  94. 31
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumPayStatus.java
  95. 42
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumPayType.java
  96. 32
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumRefundStatus.java
  97. 38
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumSceneCode.java
  98. 36
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumTimeUnit.java
  99. 51
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumUserClientType.java
  100. 34
      bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumVipOrderStatus.java

12
bnyer-api/bnyer-api-file/src/main/java/com/bnyer/file/api/RemoteFileService.java

@ -34,7 +34,15 @@ public interface RemoteFileService {
* @param files 文件
* @return -
*/
@PostMapping("/uploadBatch")
R<List<String>> uploadBatch(MultipartFile[] files);
@PostMapping(value = "/uploadBatch",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
R<List<String>> uploadBatch(@RequestPart(name = "files") MultipartFile[] files,@RequestPart(name = "fileType") Integer fileType);
/**
* 上传文件到七牛云
* @param file 文件
* @return -
*/
@PostMapping(value = "/uploadQiNiu",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
R<String> uploadQiNiu(@RequestPart(name = "file") MultipartFile file, @RequestPart(name = "fileType") Integer fileType);
}

7
bnyer-api/bnyer-api-file/src/main/java/com/bnyer/file/api/factory/RemoteFileFallbackFactory.java

@ -32,9 +32,14 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
}
@Override
public R<List<String>> uploadBatch(MultipartFile[] files) {
public R<List<String>> uploadBatch(MultipartFile[] files,Integer fileType) {
return R.fail("远程调用七牛云批量文件上传失败:" + throwable.getMessage());
}
@Override
public R<String> uploadQiNiu(MultipartFile file, Integer fileType) {
return R.fail("远程调用七牛云文件上传失败:" + throwable.getMessage());
}
};
}
}

2
bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteImgFallbackFactory.java

@ -5,7 +5,7 @@ import com.bnyer.common.core.dto.CreatorLoginDto;
import com.bnyer.common.core.dto.FhLoginDto;
import com.bnyer.common.core.dto.TiktokLoginDto;
import com.bnyer.common.core.dto.WxLoginDto;
import com.bnyer.img.api.RemoteImgService;
import com.bnyer.img.api.remote.RemoteImgService;
import com.bnyer.img.api.dto.TiktokImgMiniDto;
import com.bnyer.img.api.model.LoginCreator;
import com.bnyer.img.api.model.LoginFhUser;

33
bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteWxMiniFallbackFactory.java

@ -0,0 +1,33 @@
package com.bnyer.img.api.factory;
import com.bnyer.common.core.domain.R;
import com.bnyer.img.api.remote.RemoteUserVipService;
import com.bnyer.img.api.vo.UserVipVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
/**
* 图文服务降级处理
*
* @author penny
*/
@Component
public class RemoteWxMiniFallbackFactory implements FallbackFactory<RemoteUserVipService>
{
private static final Logger log = LoggerFactory.getLogger(RemoteWxMiniFallbackFactory.class);
@Override
public RemoteUserVipService create(Throwable throwable) {
log.error("api图文服务调用失败:{}", throwable.getMessage());
return new RemoteUserVipService() {
@Override
public R<UserVipVo> queryUserVip(Long id) {
return R.fail("获取会员信息失败:+"+throwable.getMessage());
}
};
}
}

2
bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/RemoteImgService.java → bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteImgService.java

@ -1,4 +1,4 @@
package com.bnyer.img.api;
package com.bnyer.img.api.remote;
import com.bnyer.common.core.constant.ServiceNameConstants;
import com.bnyer.common.core.domain.R;

24
bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteUserVipService.java

@ -0,0 +1,24 @@
package com.bnyer.img.api.remote;
import com.bnyer.common.core.constant.ServiceNameConstants;
import com.bnyer.common.core.domain.R;
import com.bnyer.img.api.factory.RemoteWxMiniFallbackFactory;
import com.bnyer.img.api.vo.UserVipVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
/**
* @author :WXC
* @description :
*/
@FeignClient(path = "/img/mini/vip",contextId = "remoteWxMiniService", value = ServiceNameConstants.IMG_SERVICE, fallbackFactory = RemoteWxMiniFallbackFactory.class)
public interface RemoteUserVipService {
/**
* 获取会员信息
* @return
*/
@GetMapping(value = "/queryUserVip/{id}")
R<UserVipVo> queryUserVip(@PathVariable(value = "id") Long id);
}

63
bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/UserVipVo.java

@ -0,0 +1,63 @@
package com.bnyer.img.api.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
@Getter
@Setter
@ApiModel("会员vip响应类")
public class UserVipVo implements Serializable {
@ApiModelProperty(value="主键Id")
private Long id;
@ApiModelProperty(value="vip类型id")
private Long vipTypeId;
@ApiModelProperty(value = "会员类型名称")
private String vipTypeName;
@ApiModelProperty(value="vip编码")
private String vipCode;
@ApiModelProperty(value="vip名称")
private String vipName;
@ApiModelProperty(value="原价")
private BigDecimal originPrice;
@ApiModelProperty(value="售价")
private BigDecimal price;
@ApiModelProperty(value="描述")
private String description;
@ApiModelProperty(value="热门描述")
private String hotSignDesc;
@ApiModelProperty(value="排序")
private Integer sort;
@ApiModelProperty(value="是否到期自动续费(0>否;1->是)")
private String isDelay;
@ApiModelProperty(value = "用户客户端类型:10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
private Integer userClientType;
@ApiModelProperty(value = "有效时长单位:0天,1周,2月,3季,4年")
private Integer validTimeUnit;
@ApiModelProperty(value = "有效时长:表示几天、几周、几月、几年")
private Integer validTimeNum;
@ApiModelProperty(value = "会员类型编码")
private String vipTypeCode;
private static final long serialVersionUID = 1L;
}

4
bnyer-api/bnyer-api-img/src/main/resources/META-INF/spring.factories

@ -1,2 +1,4 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration = com.bnyer.img.api.factory.RemoteImgFallbackFactory
org.springframework.boot.autoconfigure.EnableAutoConfiguration =\
com.bnyer.img.api.factory.RemoteImgFallbackFactory,\
com.bnyer.img.api.factory.RemoteWxMiniFallbackFactory

26
bnyer-api/bnyer-api-order/pom.xml

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.dimensionalnode</groupId>
<artifactId>bnyer-api</artifactId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bnyer-api-order</artifactId>
<description>
bnyer-api-order订单服务接口模块
</description>
<dependencies>
<!-- bnyer Common Core-->
<dependency>
<groupId>com.dimensionalnode</groupId>
<artifactId>bnyer-common-core</artifactId>
</dependency>
</dependencies>
</project>

26
bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/bean/query/VipOrderExtQuery.java

@ -0,0 +1,26 @@
package com.bnyer.order.api.bean.query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.io.Serializable;
/**
* @author :WXC
* @Date :2023/03/27
* @description :
*/
@Getter
@Setter
@NoArgsConstructor
public class VipOrderExtQuery implements Serializable {
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value="订单号")
private String orderNo;
}

23
bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/bean/query/VipOrderQuery.java

@ -0,0 +1,23 @@
package com.bnyer.order.api.bean.query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.io.Serializable;
/**
* @author :WXC
* @Date :2023/03/27
* @description :
*/
@Getter
@Setter
@NoArgsConstructor
public class VipOrderQuery implements Serializable {
@ApiModelProperty(value="订单号")
private String orderNo;
}

61
bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/bean/vo/VipOrderVo.java

@ -0,0 +1,61 @@
package com.bnyer.order.api.bean.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author :WXC
* @Date :2023/03/27
* @description :
*/
@Getter
@Setter
@NoArgsConstructor
public class VipOrderVo {
@ApiModelProperty(value="主键")
private Long id;
@ApiModelProperty(value="订单号")
private String orderNo;
@ApiModelProperty(value="手机号")
private String phone;
@ApiModelProperty(value="用户id")
private Long userId;
@ApiModelProperty(value="vip表id")
private Long vipId;
@ApiModelProperty(value = "vip编码")
private String vipCode;
@ApiModelProperty(value = "vip名称")
private String vipName;
@ApiModelProperty(value = "用户客户端类型:10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
private Integer userClientType;
@ApiModelProperty(value="是否到期自动续费(0>否;1->是)")
private String isDelay;
@ApiModelProperty(value="时长天数")
private Integer days;
@ApiModelProperty(value="支付金额")
private BigDecimal payAmount;
@ApiModelProperty(value = "vip类型名称")
private String vipTypeName;
@ApiModelProperty(value="订单状态:0待付款;1已付款;2已退款;3支付超时取消;4买家取消")
private Integer orderStatus;
}

42
bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/factory/RemoteVipOrderFallbackFactory.java

@ -0,0 +1,42 @@
package com.bnyer.order.api.factory;
import com.bnyer.common.core.domain.R;
import com.bnyer.order.api.bean.query.VipOrderQuery;
import com.bnyer.order.api.bean.query.VipOrderExtQuery;
import com.bnyer.order.api.remote.RemoteVipOrderService;
import com.bnyer.order.api.bean.vo.VipOrderVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author :WXC
* @Date :2023/04/03
* @description :订单服务vip订单接口熔断降级
*/
@Component
public class RemoteVipOrderFallbackFactory implements FallbackFactory<RemoteVipOrderService>
{
private static final Logger log = LoggerFactory.getLogger(RemoteVipOrderFallbackFactory.class);
@Override
public RemoteVipOrderService create(Throwable throwable) {
log.error("api订单服务调用失败:{}", throwable.getMessage());
return new RemoteVipOrderService() {
@Override
public R<List<VipOrderVo>> queryVipOrderList(VipOrderQuery query) {
return R.fail("获取会员订单信息失败:+"+throwable.getMessage());
}
@Override
public R<VipOrderVo> queryVipOrder(VipOrderExtQuery query) {
return R.fail("获取会员订单信息失败:+"+throwable.getMessage());
}
};
}
}

36
bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/remote/RemoteVipOrderService.java

@ -0,0 +1,36 @@
package com.bnyer.order.api.remote;
import com.bnyer.common.core.constant.ServiceNameConstants;
import com.bnyer.common.core.domain.R;
import com.bnyer.order.api.factory.RemoteVipOrderFallbackFactory;
import com.bnyer.order.api.bean.query.VipOrderQuery;
import com.bnyer.order.api.bean.query.VipOrderExtQuery;
import com.bnyer.order.api.bean.vo.VipOrderVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* @author :WXC
* @Date :2023/04/03
* @description :订单服务vip订单接口远程调用
*/
@FeignClient(path = "/vip",contextId = "remoteVipOrderService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteVipOrderFallbackFactory.class)
public interface RemoteVipOrderService {
/**
* 获取会员订单信息
* @param query
* @return
*/
@PostMapping("/queryVipOrderList")
R<List<VipOrderVo>> queryVipOrderList(@RequestBody VipOrderQuery query);
/**
* 查询会员订单信息(单表查询)
*/
@PostMapping("/queryVipOrder")
R<VipOrderVo> queryVipOrder(@RequestBody VipOrderExtQuery query);
}

2
bnyer-api/bnyer-api-order/src/main/resources/META-INF/spring.factories

@ -0,0 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.bnyer.order.api.factory.RemoteVipOrderFallbackFactory

4
bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/RemoteSystemFileService.java

@ -1,6 +1,6 @@
package com.bnyer.system.api;
import com.bnyer.system.api.factory.RemoteFileFallbackFactory;
import com.bnyer.system.api.factory.RemoteSystemFileFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
@ -15,7 +15,7 @@ import com.bnyer.system.api.domain.SysFile;
*
* @author ruoyi
*/
@FeignClient(contextId = "remoteSystemFileService", value = ServiceNameConstants.SYSTEM_FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
@FeignClient(contextId = "remoteSystemFileService", value = ServiceNameConstants.SYSTEM_FILE_SERVICE, fallbackFactory = RemoteSystemFileFallbackFactory.class)
public interface RemoteSystemFileService
{
/**

4
bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/factory/RemoteFileFallbackFactory.java → bnyer-api/bnyer-api-system/src/main/java/com/bnyer/system/api/factory/RemoteSystemFileFallbackFactory.java

@ -15,9 +15,9 @@ import com.bnyer.system.api.domain.SysFile;
* @author ruoyi
*/
@Component
public class RemoteFileFallbackFactory implements FallbackFactory<RemoteSystemFileService>
public class RemoteSystemFileFallbackFactory implements FallbackFactory<RemoteSystemFileService>
{
private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
private static final Logger log = LoggerFactory.getLogger(RemoteSystemFileFallbackFactory.class);
@Override
public RemoteSystemFileService create(Throwable throwable)

2
bnyer-api/bnyer-api-system/src/main/resources/META-INF/spring.factories

@ -1,4 +1,4 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.bnyer.system.api.factory.RemoteUserFallbackFactory,\
com.bnyer.system.api.factory.RemoteLogFallbackFactory, \
com.bnyer.system.api.factory.RemoteFileFallbackFactory
com.bnyer.system.api.factory.RemoteSystemFileFallbackFactory

1
bnyer-api/pom.xml

@ -12,6 +12,7 @@
<module>bnyer-api-system</module>
<module>bnyer-api-img</module>
<module>bnyer-api-file</module>
<module>bnyer-api-order</module>
</modules>
<artifactId>bnyer-api</artifactId>

36
bnyer-auth/src/main/java/com/bnyer/auth/config/JsonConfig.java

@ -0,0 +1,36 @@
package com.bnyer.auth.config;
import com.bnyer.auth.serializer.LongToStringSerializer;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
/**
* 解决雪花Id长度超过16位前端传入精度丢失的问题
*/
@Configuration
public class JsonConfig {
@Bean
@Primary
@ConditionalOnMissingBean(ObjectMapper.class)
public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder)
{
ObjectMapper objectMapper = builder.createXmlMapper(false).build();
// 全局配置序列化返回 JSON 处理
SimpleModule simpleModule = new SimpleModule();
//JSON Long ==> String
//自定义字符串转化规则ToStringSerializer换成自定义的LongToStringSerializer
simpleModule.addSerializer(Long.class, LongToStringSerializer.instance);
simpleModule.addSerializer(Long.TYPE, LongToStringSerializer.instance);
objectMapper.registerModule(simpleModule);
//参数在bean中没有的情况处理
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
return objectMapper;
}
}

24
bnyer-auth/src/main/java/com/bnyer/auth/serializer/LongToStringSerializer.java

@ -0,0 +1,24 @@
package com.bnyer.auth.serializer;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
public class LongToStringSerializer extends JsonSerializer<Long> {
public static final LongToStringSerializer instance = new LongToStringSerializer();
@Override
public void serialize(Long id, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
if(id != null){
//长度小于某个值的,还是保持long类型
if(id < 10000000000000000L){
jsonGenerator.writeNumber(id);
}else {
//长度超过某个值的,转化为字符串
jsonGenerator.writeString(id.toString());
}
}
}
}

4
bnyer-auth/src/main/java/com/bnyer/auth/service/CreatorLoginService.java

@ -4,7 +4,7 @@ import com.bnyer.common.core.constant.TiktokConstant;
import com.bnyer.common.core.domain.R;
import com.bnyer.common.core.dto.CreatorLoginDto;
import com.bnyer.common.core.exception.ServiceException;
import com.bnyer.img.api.RemoteImgService;
import com.bnyer.img.api.remote.RemoteImgService;
import com.bnyer.img.api.model.LoginCreator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -36,4 +36,4 @@ public class CreatorLoginService {
return creatorInfo.getData();
}
}
}

4
bnyer-auth/src/main/java/com/bnyer/auth/service/FhUserLoginService.java

@ -1,7 +1,7 @@
package com.bnyer.auth.service;
import com.bnyer.common.core.dto.FhLoginDto;
import com.bnyer.img.api.RemoteImgService;
import com.bnyer.img.api.remote.RemoteImgService;
import com.bnyer.img.api.model.LoginFhUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -21,4 +21,4 @@ public class FhUserLoginService {
return remoteImgService.getFhLoginUserByLoginParam(dto).getData();
}
}
}

6
bnyer-auth/src/main/java/com/bnyer/auth/service/TiktokUserLoginService.java

@ -1,14 +1,14 @@
package com.bnyer.auth.service;
import com.bnyer.common.core.dto.TiktokLoginDto;
import com.bnyer.img.api.RemoteImgService;
import com.bnyer.img.api.remote.RemoteImgService;
import com.bnyer.img.api.model.LoginTiktokUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 抖音小程序端用户登录校验方法
*
*
* @author penny
*/
@Component
@ -21,4 +21,4 @@ public class TiktokUserLoginService {
return remoteImgService.getTiktokLoginUserByLoginParam(dto).getData();
}
}
}

6
bnyer-auth/src/main/java/com/bnyer/auth/service/WxUserLoginService.java

@ -1,9 +1,7 @@
package com.bnyer.auth.service;
import com.bnyer.common.core.dto.FhLoginDto;
import com.bnyer.common.core.dto.WxLoginDto;
import com.bnyer.img.api.RemoteImgService;
import com.bnyer.img.api.model.LoginFhUser;
import com.bnyer.img.api.remote.RemoteImgService;
import com.bnyer.img.api.model.LoginWechatUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -23,4 +21,4 @@ public class WxUserLoginService {
return remoteImgService.getWxLoginUserByLoginParam(dto).getData();
}
}
}

11
bnyer-common/bnyer-common-core/pom.xml

@ -65,6 +65,11 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<!-- Alibaba Fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
@ -152,6 +157,12 @@
<artifactId>tencentcloud-sdk-java-aiart</artifactId>
<version>3.1.715</version>
</dependency>
<!--Spring-Retry重试框架-->
<dependency>
<groupId>org.springframework.retry</groupId>
<artifactId>spring-retry</artifactId>
</dependency>
</dependencies>
</project>

351
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/annotation/CustomParamsValidation.java

@ -0,0 +1,351 @@
package com.bnyer.common.core.annotation;
import org.apache.commons.lang3.StringUtils;
import javax.validation.Constraint;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import javax.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static java.lang.annotation.ElementType.*;
/**
* @author :WXC
* @Date :2023/04/11
* @description :
*/
@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Constraint(validatedBy = { CustomParamsValidation.CustomParamsValidationImpl.class })
public @interface CustomParamsValidation {
/**
* 预定义的正则表达式
*/
class Regexp{
/**
* 常规输入框匹配中文,字母数字
*/
private final static String INPUTTXT="^[A-Za-z0-9\u4e00-\u9fa5]*$";
/**
* 昵称匹配匹配中文,字母数字 下划线
*/
private final static String NICKNAME="^[A-Za-z0-9_\u4e00-\u9fa5]*$";
/**********以上public 的正则提供 regexp 属性使用**********/
/**********以下private 的正则提供 paramType 计算**********/
/**
* 匹配邮箱
*/
private final static String EMAIL="^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$";
/**
* uuid
* 格式
* {8}-{4}-{4}-{4}-{12}
*
* 4cbd6c8b-1111-45f4-b477-a524707aedfd
*/
private static final String UUID="^[a-z0-9]{8}(-[a-z0-9]{4}){3}-[a-z0-9]{12}$";
/**
* yyyy-MM-dd
*/
private static final String DATE = "^[1-9][0-9]{3}-((01|03|05|07|08|10|12)-(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)-(0[1-9]|[1-2][0-9]|30)|(02)-(0[1-9]|1[0-9]|2[0-9]))$";
/**
* yyyyMMdd
*/
private static final String DATE2 = "^[1-9][0-9]{3}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|(02)(0[1-9]|1[0-9]|2[0-9]))$";
/**
* yyyy-MM-dd HH:mm:ss
*/
private static final String DATETIME = "^[1-9][0-9]{3}-((01|03|05|07|08|10|12)-(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)-(0[1-9]|[1-2][0-9]|30)|(02)-(0[1-9]|1[0-9]|2[0-9])) ([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$";
/**
* yyyyMMddHHmmss
*/
private static final String DATETIME2 = "^[1-9][0-9]{3}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|(02)(0[1-9]|1[0-9]|2[0-9]))([01][0-9]|2[0-3])([0-5][0-9])([0-5][0-9])$";
/**
* yyyy-MM-dd HH:mm
*/
private static final String DATETIME3 = "^[1-9][0-9]{3}-((01|03|05|07|08|10|12)-(0[1-9]|[1-2][0-9]|30|31)|(04|06|09|11)-(0[1-9]|[1-2][0-9]|30)|(02)-(0[1-9]|1[0-9]|2[0-9])) ([01][0-9]|2[0-3]):([0-5][0-9])$";
/**
* HH:mm:ss
*/
private static final String TIME = "^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$";
/**
* HHmmss
*/
private static final String TIME2 = "^([01][0-9]|2[0-3])([0-5][0-9])([0-5][0-9])$";
/**
* 手机号码
*/
private static final String MOBILEPHONE="^1\\d{10}$";
/**
* 匹配IPV4地址
*/
private final static String IPV4="((25[0-5]|2[0-4]\\d|((1\\d{2})|([1-9]?\\d)))\\.){3}(25[0-5]|2[0-4]\\d|((1\\d{2})|([1-9]?\\d)))";
//=============可以在此扩展正则=============
/**
* 校验正则
* @param regexp
* @param value
* @return
*/
public static boolean validateRegexp(String regexp,String value){
Pattern pattern = Pattern.compile(regexp);
Matcher matcher = pattern.matcher(value);
return matcher.matches();
}
}
/**
* 预定义的参数类型
*/
class ParamType {
//匹配IPV4地址
public static final String IPV4 = "ipv4";
/**
* uuid
*/
public static final String UUID="uuid";
/**
* 匹配中文
*/
public static final String INPUTTXT="inputtxt";
/**
* 匹配中文英文数字下划线
*/
public static final String NICKNAME="nickname";
/**
* 匹配邮箱
*/
public static final String EMAIL="email";
/**
* 手机号码
*/
public static final String MOBILEPHONE="mobilephone";
/**
* yyyy-MM-dd
*/
public static final String DATE = "yyyy-MM-dd";
/**
* yyyyMMdd
*/
public static final String DATE2 = "yyyyMMdd";
/**
* yyyy-MM-dd HH:mm:ss
*/
public static final String DATETIME = "yyyy-MM-dd HH:mm:ss";
/**
* yyyyMMddHHmmss
*/
public static final String DATETIME2 = "yyyyMMddHHmmss";
/**
* yyyy-MM-dd HH:mm
*/
public static final String DATETIME3 = "yyyy-MM-dd HH:mm";
/**
* HH:mm:ss
*/
public static final String TIME = "HH:mm:ss";
/**
* HHmmss
*/
public static final String TIME2 = "HHmmss";
/**
* 参数类型校验
*
* @param paramType
* @param value
* @return
*/
public static boolean validateParamType(String paramType, String value) {
boolean flag = false;
switch (paramType) {
case ParamType.IPV4:
value = value.replaceAll(" ","");
flag = Regexp.validateRegexp(Regexp.IPV4, value);
break;
case ParamType.MOBILEPHONE: flag = Regexp.validateRegexp(Regexp.MOBILEPHONE, value);break;
case ParamType.NICKNAME: flag = Regexp.validateRegexp(Regexp.NICKNAME, value);break;
case ParamType.EMAIL: flag = Regexp.validateRegexp(Regexp.EMAIL, value);break;
case ParamType.UUID : flag = Regexp.validateRegexp(Regexp.UUID, value);break;
case ParamType.INPUTTXT : flag = Regexp.validateRegexp(Regexp.INPUTTXT, value);break;
case ParamType.DATE : flag = validateDateParamType(ParamType.DATE, value);break;
case ParamType.DATE2 : flag = validateDateParamType(ParamType.DATE2, value);break;
case ParamType.DATETIME : flag = validateDateParamType(ParamType.DATETIME, value);break;
case ParamType.DATETIME2 : flag = validateDateParamType(ParamType.DATETIME2, value);break;
case ParamType.DATETIME3 : flag = validateDateParamType(ParamType.DATETIME3, value);break;
case ParamType.TIME : flag = validateDateParamType(ParamType.TIME, value);break;
case ParamType.TIME2 : flag = validateDateParamType(ParamType.TIME2, value);break;
}
return flag;
}
/**
* dateFormat 属性配置配置的值 不是内置值验证无法通过
* @param dateFormat
* @param value
* @return
*/
private static boolean validateDateParamType(String dateFormat,String value){
String regexp = null;
if(DATE.equals(dateFormat)){
regexp = Regexp.DATE;
}else if(DATE2.equals(dateFormat)){
regexp = Regexp.DATE2;
}else if(DATETIME.equals(dateFormat)){
regexp = Regexp.DATETIME;
}else if(DATETIME2.equals(dateFormat)){
regexp = Regexp.DATETIME2;
}else if(DATETIME3.equals(dateFormat)){
regexp = Regexp.DATETIME3;
}else if(TIME.equals(dateFormat)){
regexp = Regexp.TIME;
}else if(TIME2.equals(dateFormat)){
regexp = Regexp.TIME2;
}
if(regexp!=null){
boolean flag = Regexp.validateRegexp(regexp, value);
//时间不用做2月29日瑞年判断
if(TIME.equals(dateFormat) || TIME2.equals(dateFormat)){
return flag;
}
if(flag){
//月份和日期部分
String monthAndDay = "";
//2月29日常量
String monthAndDayConstant = "";
Integer year = null;
switch (dateFormat) {
case DATE:
case DATETIME:
case DATETIME3:
monthAndDay = StringUtils.substring(value, 5, 10);
monthAndDayConstant = "02-29";
year = Integer.valueOf(StringUtils.substring(value, 0, 4));
break;
case DATE2:
case DATETIME2:
monthAndDay = StringUtils.substring(value, 4, 8);
monthAndDayConstant = "0229";
year = Integer.valueOf(StringUtils.substring(value, 0, 4));
break;
}
//2月29日判断是否是润年,非润年没有2月29日
if(monthAndDay.equals(monthAndDayConstant)){
if(!isLeapYear(year)){
flag = false;
}
}
}
return flag;
}
return false;
}
/**
* 判断是否是润年
* @param year
* @return
*/
private static boolean isLeapYear(int year){
return year % 400 == 0 || (year % 4 == 0 && year % 100 != 0);
}
}
/**
* 预定义Range
*
*/
class Range{
private static boolean contains(String range,String value){
boolean flag = false;
if(StringUtils.isEmpty(value)){
return false;
}
if(StringUtils.isNotEmpty(range)){
String[] arr = range.split("\\|");
for (String string : arr) {
if(value.equals(string)){
flag = true;
break;
}
}
}
return flag;
}
}
/**
* 参数类型最优先推荐使用的属性
* @return
*/
String paramType() default "";
/**
* 限制字符串或者数字 可选项, | 分割 00|10|20
* @return
*/
String range() default "";
String message() default "参数基本校验不通过错误:注意格式及长度";
Class<?>[]groups() default {};
Class<? extends Payload>[]payload() default {};
class CustomParamsValidationImpl implements ConstraintValidator<CustomParamsValidation,String> {
String paramType;
String range;
@Override
public void initialize(CustomParamsValidation constraintAnnotation) {
paramType = constraintAnnotation.paramType();
range = constraintAnnotation.range();
}
@Override
public boolean isValid(String value, ConstraintValidatorContext context) {
if(StringUtils.isNotEmpty(value)){
//根据参数类型校验正则
if(StringUtils.isNotEmpty(paramType)){
return ParamType.validateParamType(paramType, value);
}
//校验参数范围
if (StringUtils.isNotEmpty(range)){
return Range.contains(range, value);
}
}
return true;
}
}
}

63
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/annotation/LimitRepeatRequest.java

@ -0,0 +1,63 @@
package com.bnyer.common.core.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.METHOD;
/**
* @author :WXC
* @Date :2023/05/12
* @description : 防重复提交
*/
@Target({ METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface LimitRepeatRequest {
/**
* 限制当前用户同一个api 不能重复提交
*/
String SELF="self";
/**
* 限制所有用户同一个参数不能重复提交如我新增了用户 张三 那么其他人不能再并发情况下重复添加张三
*/
String ALL_USER="all";
/**
* 当前时间内 api 只能请求一次单位秒
* @return
*/
long time() default 5;
/**
* 对部分参数做重复请求限制
* @return
*/
String[] bodyParam() default {};
/**
* 是否对全部参数做重复请求限制
* @return
*/
boolean bodyAllParam() default false;
/**
* 重复请求限制的用户范围
* LimitRepeatRequest.SELF针对当前登录用户
* LimitRepeatRequest.ALL_USER针对所有用户
*
* @return
*/
String userRange() default SELF;
/**
* 错误提示信息
* @return
*/
String message() default "";
}

30
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/RedisKeyConstant.java

@ -94,14 +94,24 @@ public class RedisKeyConstant {
public static final String VERIFY_PROFIT_LOCK_KEY = "bnyer.img.profit.lock:";
/**
* 平台用户下载键
* 平台用户下载图片广告
*/
public static final String PLATFORM_USER_DOWNLOAD_KEY = "bnyer.img.user.download:";
/**
* 平台用户绘画奖励广告键
*/
public static final String PLATFORM_USER_PAINT_REWARD_KEY = "bnyer.img.user.paint.reward:";
/**
* 平台用户签到奖励键
*/
public static final String PLATFORM_USER_SIGN_REWARD_KEY = "bnyer.img.user.sign.reward:";
/**
* 平台用户ai绘画键
*/
public static final String PLATFORM_USER_AI_PAINT_KEY = "bnyer.img.user.aiPaint:";
//public static final String PLATFORM_USER_AI_PAINT_KEY = "bnyer.img.user.aiPaint:";
/**
* ai绘画采用sd或tx文生图开关
@ -151,4 +161,20 @@ public class RedisKeyConstant {
* 热搜词存入时间
*/
public static final String HOT_KEY_WORD_TIME_KEY = "bnyer.hotkeywordtime";
/**
* 支付回调rediskey
*/
public static final String PAY_NOTIFY_LOCK_KEY = "bnyer.pay.notify.lock:";
/**
* 抖音ACCESS_TOKEN
*/
public static final String DY_ACCESS_TOKEN_KEY = "bnyer.pay.dy.access.token";
/**
* 快手ACCESS_TOKEN
*/
public static final String KS_ACCESS_TOKEN_KEY = "bnyer.pay.ks.access.token";
}

5
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/SecurityConstants.java

@ -7,6 +7,11 @@ package com.bnyer.common.core.constant;
*/
public class SecurityConstants
{
/**
* 平台 抖音->10;快手->20;微信->30;微信艺术家->40;pc管理员->50
*/
public static final String PLATFORM = "platform";
//***************************PC信息开始************************************
/**
* 用户ID字段

10
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/ServiceNameConstants.java

@ -27,8 +27,18 @@ public class ServiceNameConstants
*/
public static final String IMG_SERVICE = "bnyer-img";
/**
* 订单服务的serviceid
*/
public static final String ORDER_SERVICE = "bnyer-order";
/**
* 文件服务的serviceid
*/
public static final String FILE_SERVICE = "bnyer-file";
/**
* pay服务的serviceid
*/
public static final String PAY_SERVICE = "bnyer-pay";
}

10
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/TiktokConstant.java

@ -90,4 +90,14 @@ public class TiktokConstant {
* 邮箱已被注册使用
*/
public static final Integer EMAIL_EXIST_ERROR = 105015;
/**
* 画意值不足
*/
public static final Integer GOLD_NUM_IS_NOT_ENOUGH = 105016;
/**
* 用户类型错误
*/
public static final Integer USER_TYPE_ERROR = 105017;
}

68
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AiPaint.java

@ -5,17 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* ai绘画内容表
@ -70,6 +65,56 @@ public class AiPaint implements Serializable {
@ApiModelProperty(value="关键词")
private String prompt;
/**
* 反向关键词
*/
@TableField(value = "negative_prompt")
@ApiModelProperty(value="反向关键词")
private String negativePrompt;
/**
* 采样步数
*/
@TableField(value = "steps")
@ApiModelProperty(value="采样步数")
private Integer steps;
/**
* 种子值
*/
@TableField(value = "seed")
@ApiModelProperty(value="种子值")
private Integer seed;
/**
* 批量数量
*/
@TableField(value = "batch_size")
@ApiModelProperty(value="批量数量")
private Integer batchSize;
/**
* 精细度
*/
@TableField(value = "cfg_scale")
@ApiModelProperty(value="精细度")
private Double cfgScale;
/**
* eta值
*/
@TableField(value = "eta")
@ApiModelProperty(value="eta值")
private Double eta;
/**
* 采样器
*/
@TableField(value = "sampler_index")
@ApiModelProperty(value="采样器")
private String samplerIndex;
/**
* 模型名称
*/
@ -109,9 +154,16 @@ public class AiPaint implements Serializable {
* 平台(0->Hub;1->抖音;2->快手;3->微信)
*/
@TableField(value = "`source`")
@ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String source;
/**
* app类型(0->次元意境;1->妙鸭壁纸)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
/**
* 创建时间
*/

77
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AlipayConfig.java

@ -0,0 +1,77 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @author :WXC
* @description :
*/
/**
* 支付宝支付配置表
*/
@ApiModel(value="com-bnyer-common-core-domain-PayAlipayConfig")
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "pay_alipay_config")
public class AlipayConfig extends BaseDomain {
/**
* appid
*/
@TableField(value = "appid")
@ApiModelProperty(value="appid")
private String appid;
/**
* app私钥
*/
@TableField(value = "app_private_key")
@ApiModelProperty(value="app私钥")
private String appPrivateKey;
/**
* 阿里公钥
*/
@TableField(value = "alipay_public_key")
@ApiModelProperty(value="阿里公钥")
private String alipayPublicKey;
/**
* RSA/RSA2
*/
@TableField(value = "key_type")
@ApiModelProperty(value="RSA/RSA2")
private String keyType;
/**
* 回调地址url
*/
@TableField(value = "backurl")
@ApiModelProperty(value="回调地址url")
private String backurl;
/**
* 帐号状态0正常 1停用
*/
@TableField(value = "status")
@ApiModelProperty(value="帐号状态(0正常 1停用)")
private String status;
@TableField(value = "remark")
@ApiModelProperty(value="")
private String remark;
}

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Banner.java

@ -42,7 +42,7 @@ public class Banner extends BaseDomain {
* 平台(0->通用;1->抖音;2->快手;3->微信)
*/
@TableField(value = "source")
@ApiModelProperty(value="平台(0->通用;1->抖音;2->快手;3->微信)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String source;
private static final long serialVersionUID = 1L;

80
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseMqMessage.java

@ -0,0 +1,80 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.bnyer.common.core.enums.EnumMessageStatus;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* @author :WXC
* @Date :2023/05/18
* @description :消息记录公共实体
*/
@Data
public class BaseMqMessage {
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
/**
* 消息key作为redis的key消费的时候判断是否存在
* 存在就判断状态是否是已消费如果不是就进行消费如果是就过滤该消息
*/
@TableField(value = "message_key")
private String messageKey;
/**
* 消息主题
*/
@TableField(value = "topic")
private String topic;
/**
* 消息tag
*/
@TableField(value = "tag")
private String tag;
/**
* 消费组名称
*/
@TableField(value = "consumer_group_name")
private String consumerGroupName;
/**
* 返回主题
*/
@TableField(value = "return_topic")
private String returnTopic;
/**
* 消息状态
*/
@TableField(value = "status")
private EnumMessageStatus status;
/**
* 消息内容
*/
@TableField(value = "content")
private String content;
/**
* 错误信息
*/
@TableField(value = "err_msg")
private String errMsg;
/**
* 创建时间
*/
@TableField(value = "create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
}

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java

@ -47,7 +47,7 @@ public class BzData {
private Long uv;
/**
* 平台(0->Hub;1->抖音;2->快手;3->微信)
* 平台(1->抖音;2->快手;3->微信)
*/
@TableField(value = "source")
@ApiModelProperty(value="source")

11
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CdkLog.java

@ -53,12 +53,19 @@ public class CdkLog implements Serializable {
private Long userId;
/**
* 平台(0->Hub;1->抖音;2->快手;3->微信)
* 平台(1->抖音;2->快手;3->微信)
*/
@TableField(value = "`source`")
@ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String source;
/**
* app类型(0->次元意境;1->妙鸭壁纸)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
/**
* 是否显示 (0->隐藏1->显示)
*/

4
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java

@ -69,14 +69,14 @@ public class CreatorProfit extends BaseDomain {
* 结算平台(0->抖音;1->快手;2->微信;3->uniapp)
*/
@TableField(value = "platform")
@ApiModelProperty(value="结算平台(0->抖音;1->快手;2->微信;3->uniapp)")
@ApiModelProperty(value="结算平台(1->抖音;2->快手;3->微信)")
private String platform;
/**
* 应用类型(0->次元意境)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="应用类型(0->次元意境)")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
/**

58
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/DiamondLog.java

@ -0,0 +1,58 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
/**
* 意心记录表
*/
@ApiModel(value="com-bnyer-common-core-DiamondLog")
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "img_diamond_log")
public class DiamondLog extends BaseDomain {
/**
* 用户id
*/
@TableField(value = "user_id")
@ApiModelProperty(value="用户id")
private Long userId;
/**
* 意心获取/消耗点数
*/
@TableField(value = "diamond_num")
@ApiModelProperty(value="意心获取/消耗点数")
private Integer diamondNum;
/**
* 获取/消耗原因
*/
@TableField(value = "reason")
@ApiModelProperty(value="获取/消耗原因")
private String reason;
/**
* 平台(0->Hub;1->抖音;2->快手;3->微信)
*/
@TableField(value = "`source`")
@ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
private String source;
/**
* app类型(0->次元意境;1->妙鸭壁纸)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
private static final long serialVersionUID = 1L;
}

69
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/DypayConfig.java

@ -0,0 +1,69 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
/**
* @author :WXC
* @description :
*/
/**
* 抖音支付配置表
*/
@ApiModel(value="com-bnyer-common-core-domain-PayDypayConfig")
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "pay_dypay_config")
public class DypayConfig extends BaseDomain {
/**
* appid
*/
@TableField(value = "appid")
@ApiModelProperty(value="appid")
private String appid;
/**
* 应用秘钥
*/
@TableField(value = "appSecret")
@ApiModelProperty(value="应用秘钥")
private String appSecret;
/**
* 支付秘钥
*/
@TableField(value = "salt")
@ApiModelProperty(value="支付秘钥")
private String salt;
/**
* 令牌
*/
@TableField(value = "token")
@ApiModelProperty(value="支付令牌")
private String token;
/**
* 回调地址url
*/
@TableField(value = "backurl")
@ApiModelProperty(value="回调地址url")
private String backurl;
/**
* 帐号状态0正常 1停用
*/
@TableField(value = "status")
@ApiModelProperty(value="帐号状态(0正常 1停用)")
private String status;
@TableField(value = "remark")
@ApiModelProperty(value="")
private String remark;
}

4
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Feedback.java

@ -25,10 +25,10 @@ public class Feedback extends BaseDomain {
private String info;
/**
* 来源平台(0->抖音;1->快手;2->微信)
* 来源平台(1->抖音;2->快手;3->微信)
*/
@TableField(value = "source")
@ApiModelProperty(value="来源平台(0->抖音;1->快手;2->微信)")
@ApiModelProperty(value="来源平台(1->抖音;2->快手;3->微信)")
private String source;
private static final long serialVersionUID = 1L;

23
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/FhUser.java

@ -1,8 +1,6 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -53,6 +51,20 @@ public class FhUser extends BaseDomain {
@ApiModelProperty(value="是否为vip(0->否;1->是)")
private String isVip;
/**
* 画意值
*/
@TableField(value = "gold_num")
@ApiModelProperty(value="画意值")
private Integer goldNum;
/**
* 意心
*/
@TableField(value = "diamond_num")
@ApiModelProperty(value="意心")
private Integer diamondNum;
/**
* 头像img地址
*/
@ -60,5 +72,12 @@ public class FhUser extends BaseDomain {
@ApiModelProperty(value="头像img地址")
private String img;
/**
* app类型(0->次元意境;1->妙鸭壁纸)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
private static final long serialVersionUID = 1L;
}

57
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/GoldLog.java

@ -0,0 +1,57 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
/**
* 画意值记录
*/
@ApiModel(value="com-bnyer-common-core-GoldLog")
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "img_gold_log")
public class GoldLog extends BaseDomain {
/**
* 用户id
*/
@TableField(value = "user_id")
@ApiModelProperty(value="用户id")
private Long userId;
/**
* 画意值获取/消耗点数
*/
@TableField(value = "gold_num")
@ApiModelProperty(value="画意值获取/消耗点数")
private Integer goldNum;
/**
* 获取/消耗原因
*/
@TableField(value = "reason")
@ApiModelProperty(value="获取/消耗原因")
private String reason;
/**
* 平台(1->抖音;2->快手;3->微信)
*/
@TableField(value = "`source`")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String source;
/**
* app类型(0->次元意境;1->妙鸭壁纸)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
private static final long serialVersionUID = 1L;
}

19
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgMqMessageRecord.java

@ -0,0 +1,19 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/**
* @author :WXC
* @Date :2023/05/18
* @description :图片服务本地消息表
*/
@Getter
@Setter
@NoArgsConstructor
@TableName(value = "img_mq_message_record")
public class ImgMqMessageRecord extends BaseMqMessage{
}

62
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/KspayConfig.java

@ -0,0 +1,62 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @author :WXC
* @description :
*/
/**
* 快手支付配置表
*/
@ApiModel(value="com-bnyer-common-core-domain-PayKspayConfig")
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "pay_kspay_config")
public class KspayConfig extends BaseDomain {
/**
* appid
*/
@TableField(value = "appid")
@ApiModelProperty(value="appid")
private String appid;
/**
* 秘钥
*/
@TableField(value = "secret")
@ApiModelProperty(value="秘钥")
private String secret;
/**
* 回调地址url
*/
@TableField(value = "backurl")
@ApiModelProperty(value="回调地址url")
private String backurl;
/**
* 帐号状态0正常 1停用
*/
@TableField(value = "status")
@ApiModelProperty(value="帐号状态(0正常 1停用)")
private String status;
@TableField(value = "remark")
@ApiModelProperty(value="")
private String remark;
}

19
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/OrderMqMessageRecord.java

@ -0,0 +1,19 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/**
* @author :WXC
* @Date :2023/05/18
* @description :订单服务本地消息表
*/
@Getter
@Setter
@NoArgsConstructor
@TableName(value = "order_mq_message_record")
public class OrderMqMessageRecord extends BaseMqMessage{
}

11
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PaintCdk.java

@ -60,12 +60,19 @@ public class PaintCdk implements Serializable {
private String isUse;
/**
* 平台(0->Hub;1->抖音;2->快手;3->微信)
* 平台(1->抖音;2->快手;3->微信)
*/
@TableField(value = "`source`")
@ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String source;
/**
* app类型(0->次元意境;1->妙鸭壁纸)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
/**
* 创建时间
*/

222
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PayInfo.java

@ -0,0 +1,222 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @author :WXC
* @description :
*/
/**
* 付款信息表
*/
@ApiModel(value="com-bnyer-common-core-domain-PayPayInfo")
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "pay_pay_info")
public class PayInfo extends BaseDomain {
/**
* 支付单号(内部生成)
*/
@TableField(value = "pay_id")
@ApiModelProperty(value="支付单号(内部生成)")
private String payId;
/**
* 业务主订单号关联内部业务订单表
*/
@TableField(value = "order_no")
@ApiModelProperty(value="业务主订单号:关联内部业务订单表")
private String orderNo;
/**
* 支付状态1000未支付;1001支付成功 ;1002支付失败
*/
@TableField(value = "pay_status")
@ApiModelProperty(value="支付状态:1000未支付;1001支付成功 ;1002支付失败")
private Integer payStatus;
/**
* 单笔对账状态1001 对账成功
*/
@TableField(value = "single_status")
@ApiModelProperty(value="单笔对账状态:1001 对账成功")
private Integer singleStatus;
/**
* 单笔对账时间
*/
@TableField(value = "single_time")
@ApiModelProperty(value="单笔对账时间")
private Date singleTime;
/**
* 支付类型wxpay/alipay/kspay/dypay
*/
@TableField(value = "pay_type")
@ApiModelProperty(value="支付类型:wxpay/alipay/kspay/dypay")
private String payType;
/**
* 支付渠道
*/
@TableField(value = "pay_channel")
@ApiModelProperty(value="支付渠道:wxpay/alipay")
private String payChannel;
/**
* 交易类型1--JSAPI支付小程序appId支付2--Native支付3--app支付4--JSAPI支付公众号appId支付5--H5支付
*/
@TableField(value = "trade_type")
@ApiModelProperty(value = "交易类型:1--JSAPI支付(小程序appId支付)、2--Native支付、3--app支付,4--JSAPI支付(公众号appId支付)5--H5支付")
private String tradeType;
/**
* 支付单号(第三方返回)
*/
@TableField(value = "pay_no")
@ApiModelProperty(value="支付单号(第三方返回)")
private String payNo;
/**
* 用户侧订单号(第三方返回)
*/
@TableField(value = "trade_no")
@ApiModelProperty(value="用户侧订单号(第三方返回)")
private String tradeNo;
/**
* appid
*/
@TableField(value = "appid")
@ApiModelProperty(value="appid")
private String appid;
/**
* 商品标题
*/
@TableField(value = "goods_subject")
@ApiModelProperty(value="商品标题")
private String goodsSubject;
/**
* 商品描述
*/
@TableField(value = "goods_desc")
@ApiModelProperty(value="商品描述")
private String goodsDesc;
/**
* 支付金额单位元
*/
@TableField(value = "pay_amount")
@ApiModelProperty(value="支付金额,单位元")
private BigDecimal payAmount;
/**
* 支付时间
*/
@TableField(value = "pay_time")
@ApiModelProperty(value="支付时间")
private Date payTime;
/**
* 支付场景1.会员充值
*/
@TableField(value = "scene_code")
@ApiModelProperty(value="支付场景:1.会员充值")
private Integer sceneCode;
/**
* 用户ip
*/
@TableField(value = "ip")
@ApiModelProperty(value="用户ip")
private String ip;
/**
* 调用第三方下单返回
*/
@TableField(value = "third_code")
@ApiModelProperty(value="调用第三方下单返回")
private String thirdCode;
/**
* 调用第三方下单返回
*/
@TableField(value = "third_msg")
@ApiModelProperty(value="调用第三方下单返回")
private String thirdMsg;
/**
* 调用第三方下单返回
*/
@TableField(value = "third_no")
@ApiModelProperty(value="调用第三方下单返回")
private String thirdNo;
/**
* 退款状态 1000 未退款 1001退款失败 1002 退款成功 1003 退款中
*/
@TableField(value = "refund_status")
@ApiModelProperty(value="退款状态 1000 未退款 1001退款失败 1002 退款成功 1003 退款中")
private Integer refundStatus;
/**
* 退款时间
*/
@TableField(value = "refund_time")
@ApiModelProperty(value="退款时间")
private Date refundTime;
/**
* 退款金额
*/
@TableField(value = "refund_amount")
@ApiModelProperty(value="退款金额")
private BigDecimal refundAmount;
/**
* 退款流水号(第三方返回)
*/
@TableField(value = "refund_no")
@ApiModelProperty(value="退款流水号(第三方返回)")
private String refundNo;
/**
* 退款接口调用code(第三方返回)
*/
@TableField(value = "refund_code")
@ApiModelProperty(value="退款接口调用code(第三方返回)")
private String refundCode;
/**
* 退款接口调用msg(第三方返回)
*/
@TableField(value = "refund_msg")
@ApiModelProperty(value="退款接口调用msg(第三方返回)")
private String refundMsg;
/**
* 备注
*/
@TableField(value = "remark")
@ApiModelProperty(value="备注")
private String remark;
}

19
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PayMqMessageRecord.java

@ -0,0 +1,19 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/**
* @author :WXC
* @Date :2023/05/18
* @description :支付服务本地消息表
*/
@Getter
@Setter
@NoArgsConstructor
@TableName(value = "pay_mq_message_record")
public class PayMqMessageRecord extends BaseMqMessage{
}

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java

@ -90,7 +90,7 @@ public class ProductOrder implements Serializable {
* 来源平台(0->抖音;1->快手;2->微信)
*/
@TableField(value = "platform")
@ApiModelProperty(value="来源平台(0->抖音;1->快手;2->微信)")
@ApiModelProperty(value="来源平台(1->抖音;2->快手;3->微信)")
private String platform;
/**

4
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java

@ -56,14 +56,14 @@ public class ProfitVerifyOrder implements Serializable {
* 平台(0->抖音;1->快手)
*/
@TableField(value = "platform")
@ApiModelProperty(value="平台(0->抖音;1->快手;2->微信)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String platform;
/**
* 应用(0->bnyer)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="应用(0->bnyer)")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
/**

26
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/R.java

@ -3,6 +3,8 @@ package com.bnyer.common.core.domain;
import java.io.Serializable;
import com.bnyer.common.core.constant.Constants;
import com.bnyer.common.core.enums.ResponseEnum;
import com.bnyer.common.core.web.domain.AjaxResult;
/**
* 响应信息主体
@ -65,6 +67,25 @@ public class R<T> implements Serializable
return restResult(null, code, msg);
}
/**
* 返回错误消息
* @param responseEnum
* @return
*/
public static <T> R<T> fail(ResponseEnum responseEnum)
{
return restResult(null,responseEnum.getCode(), responseEnum.getMsg());
}
/**
* 构建重复提交错误消息
* @param time
* @return
*/
public R<T> buildRepeatRequest(int time){
return restResult(null,ResponseEnum.REPEAT_REQUEST_ERROR.getCode(),time+"秒内"+ResponseEnum.REPEAT_REQUEST_ERROR.getMsg());
}
private static <T> R<T> restResult(T data, int code, String msg)
{
R<T> apiResult = new R<>();
@ -103,4 +124,9 @@ public class R<T> implements Serializable
{
this.data = data;
}
public boolean isSuccess(){
return this.code == SUCCESS;
}
}

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java

@ -37,7 +37,7 @@ public class TiktokCollection extends BaseDomain {
* 平台(0->抖音;1->快手;2->微信)
*/
@TableField(value = "platform")
@ApiModelProperty(value="平台(0->抖音;1->快手;2->微信)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String platform;
private static final long serialVersionUID = 1L;

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java

@ -45,7 +45,7 @@ public class TiktokLike extends BaseDomain {
* 平台(0->抖音;1->快手;2->微信)
*/
@TableField(value = "platform")
@ApiModelProperty(value="平台(0->抖音;1->快手;2->微信)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String platform;
private static final long serialVersionUID = 1L;

21
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokUser.java

@ -45,6 +45,20 @@ public class TiktokUser extends BaseDomain {
@ApiModelProperty(value="是否为vip(0->否;1->是)")
private String isVip;
/**
* 画意值
*/
@TableField(value = "gold_num")
@ApiModelProperty(value="画意值")
private Integer goldNum;
/**
* 意心
*/
@TableField(value = "diamond_num")
@ApiModelProperty(value="意心")
private Integer diamondNum;
/**
* 头像img地址
*/
@ -52,5 +66,12 @@ public class TiktokUser extends BaseDomain {
@ApiModelProperty(value="头像img地址")
private String img;
/**
* app类型(0->次元意境;1->妙鸭壁纸)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
private static final long serialVersionUID = 1L;
}

30
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVip.java

@ -19,6 +19,13 @@ import java.math.BigDecimal;
@TableName(value = "img_user_vip")
public class UserVip extends BaseDomain {
/**
* vip类型id
*/
@TableField(value = "vip_type_id")
@ApiModelProperty(value="vip类型id")
private Long vipTypeId;
/**
* vip名称
*/
@ -61,13 +68,6 @@ public class UserVip extends BaseDomain {
@ApiModelProperty(value="热门描述")
private String hotSignDesc;
/**
* 时长天数
*/
@TableField(value = "days")
@ApiModelProperty(value="时长天数")
private Integer days;
/**
* 是否到期自动续费(0>;1->)
*/
@ -75,5 +75,19 @@ public class UserVip extends BaseDomain {
@ApiModelProperty(value="是否到期自动续费(0>否;1->是)")
private String isDelay;
/**
* 有效时长单位0天1周2月3季4年
*/
@TableField(value = "valid_time_unit")
@ApiModelProperty(value = "有效时长单位:0天,1周,2月,3季,4年")
private Integer validTimeUnit;
/**
* 有效时长表示几天几周几月几年
*/
@TableField(value = "valid_time_num")
@ApiModelProperty(value = "有效时长:表示几天、几周、几月、几年")
private Integer validTimeNum;
private static final long serialVersionUID = 1L;
}
}

50
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java

@ -1,15 +1,12 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
import java.util.Date;
@ApiModel(value="com-bnyer-common-core-domain-UserVipRecord")
@ -22,11 +19,11 @@ import java.util.Date;
public class UserVipRecord extends BaseDomain {
/**
* 订单id
* 用户id
*/
@TableField(value = "order_id")
@ApiModelProperty(value="订单id")
private String orderId;
@TableField(value = "user_id")
@ApiModelProperty(value="用户id")
private Long userId;
/**
* 用户手机号
@ -36,11 +33,11 @@ public class UserVipRecord extends BaseDomain {
private String phone;
/**
* 用户vip表id
* vip表id
*/
@TableField(value = "user_vip_id")
@ApiModelProperty(value="用户vip表id")
private Long userVipId;
@TableField(value = "vip_id")
@ApiModelProperty(value="vip表id")
private Long vipId;
/**
* 开始时间
@ -59,25 +56,32 @@ public class UserVipRecord extends BaseDomain {
private Date endTime;
/**
* 支付金额
* 状态(0->已到期;1->已生效)
*/
@TableField(value = "price")
@ApiModelProperty(value="支付金额")
private BigDecimal price;
@TableField(value = "status")
@ApiModelProperty(value="状态(0->已到期;1->已生效;)")
private Integer status;
/**
* vip类型状态(0->月卡;1->季卡;2->年卡)
* vip名称
*/
@TableField(value = "type")
@ApiModelProperty(value="vip类型状态(0->月卡;1->季卡;2->年卡)")
private String type;
@TableField(value = "vip_name")
@ApiModelProperty(value="vip名称")
private String vipName;
/**
* 支付状态(0->待支付;1->已支付;2->支付失败;3->支付异常)
* vip类型名称
*/
@TableField(value = "status")
@ApiModelProperty(value="支付状态(0->待支付;1->已支付;2->支付失败;3->支付异常)")
private String status;
@TableField(value = "vip_type_name")
@ApiModelProperty(value = "vip类型名称")
private String vipTypeName;
/**
* 用户客户端类型10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信
*/
@TableField(value = "user_client_type")
@ApiModelProperty(value = "用户客户端类型:10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
private Integer userClientType;
private static final long serialVersionUID = 1L;
}

134
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java

@ -0,0 +1,134 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author :WXC
* @description :
*/
/**
* 会员订单表
*/
@ApiModel(value="com-bnyer-common-core-domain-OrderVipOrder")
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "order_vip_order")
public class VipOrder extends BaseDomain {
/**
* 订单号
*/
@TableField(value = "order_no")
@ApiModelProperty(value="订单号")
private String orderNo;
/**
* 用户手机号
*/
@TableField(value = "phone")
@ApiModelProperty(value="用户手机号")
private String phone;
/**
* 用户id
*/
@TableField(value = "user_id")
@ApiModelProperty(value="用户id")
private Long userId;
/**
* vip主键Id
*/
@TableField(value = "vip_id")
@ApiModelProperty(value="vip主键Id")
private Long vipId;
/**
* vip编码
*/
@TableField(value = "vip_code")
@ApiModelProperty(value="vip编码")
private String vipCode;
/**
* vip名称
*/
@TableField(value = "vip_name")
@ApiModelProperty(value="vip名称")
private String vipName;
/**
* 支付金额单位元
*/
@TableField(value = "pay_amount")
@ApiModelProperty(value="支付金额,单位元")
private BigDecimal payAmount;
/**
* 是否到期自动续费(0>;1->)
*/
@TableField(value = "is_delay")
@ApiModelProperty(value="是否到期自动续费(0>否;1->是)")
private String isDelay;
/**
* 时长天数
*/
@TableField(value = "days")
@ApiModelProperty(value="时长天数")
private Integer days;
/**
* 订单状态0未处理1成功2失败
*/
@TableField(value = "order_status")
@ApiModelProperty(value="订单状态:0待付款;1已付款;2已退款;3支付超时取消;4买家取消")
private Integer orderStatus;
/**
* 支付时间
*/
@TableField(value = "pay_time")
@ApiModelProperty(value="支付时间")
private Date payTime;
/**
* 取消时间
*/
@TableField(value = "cancel_time")
@ApiModelProperty(value="取消时间")
private Date cancelTime;
/**
* 用户客户端类型10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信
*/
@TableField(value = "user_client_type")
@ApiModelProperty(value = "用户客户端类型:10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
private Integer userClientType;
/**
* vip类型名称
*/
@TableField(value = "vip_type_name")
@ApiModelProperty(value = "vip类型名称")
private String vipTypeName;
/**
* 备注
*/
@TableField(value = "remark")
@ApiModelProperty(value="备注")
private String remark;
}

30
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipType.java

@ -0,0 +1,30 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "img_vip_type")
public class VipType extends BaseDomain {
/**
* 类型编码
*/
@TableField(value = "type_code")
@ApiModelProperty(value="类型编码")
private String typeCode;
/**
* 类型名称
*/
@TableField(value = "type_name")
@ApiModelProperty(value="类型名称")
private String typeName;
}

15
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java

@ -1,13 +1,9 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.bnyer.common.core.annotation.Desensitized;
import com.bnyer.common.core.enums.SensitiveTypeEnum;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@ -38,12 +34,19 @@ public class WithdrawLog extends BaseDomain {
private Long creatorId;
/**
* 提现金额
* 提现金额
*/
@TableField(value = "amt")
@ApiModelProperty(value="提现金额")
@ApiModelProperty(value="提现金额")
private BigDecimal amt;
/**
* 手续费
*/
@TableField(value = "fee")
@ApiModelProperty(value="手续费")
private BigDecimal fee;
/**
* 支付宝手机号(加密)
*/

23
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WxUser.java

@ -1,8 +1,6 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -53,6 +51,20 @@ public class WxUser extends BaseDomain {
@ApiModelProperty(value="是否为vip(0->否;1->是)")
private String isVip;
/**
* 画意值
*/
@TableField(value = "gold_num")
@ApiModelProperty(value="画意值")
private Integer goldNum;
/**
* 意心
*/
@TableField(value = "diamond_num")
@ApiModelProperty(value="意心")
private Integer diamondNum;
/**
* 头像img地址
*/
@ -60,5 +72,12 @@ public class WxUser extends BaseDomain {
@ApiModelProperty(value="头像img地址")
private String img;
/**
* app类型(0->次元意境;1->妙鸭壁纸)
*/
@TableField(value = "app_type")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
private static final long serialVersionUID = 1L;
}

105
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WxpayConfig.java

@ -0,0 +1,105 @@
package com.bnyer.common.core.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @author :WXC
* @description :
*/
/**
* 微信支付配置表
*/
@ApiModel(value="com-bnyer-common-core-domain-PayWxpayConfig")
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "pay_wxpay_config")
public class WxpayConfig extends BaseDomain {
/**
* 1--JSAPI支付小程序appId支付2--Native支付3--app支付4--JSAPI支付公众号appId支付5--H5支付
*/
@TableField(value = "trade_type")
@ApiModelProperty(value="1--JSAPI支付(小程序appId支付)、2--Native支付、3--app支付,4--JSAPI支付(公众号appId支付)5--H5支付")
private String tradeType;
/**
* appid
*/
@TableField(value = "appid")
@ApiModelProperty(value="appid")
private String appid;
/**
* 商户号
*/
@TableField(value = "mchid")
@ApiModelProperty(value="商户号")
private String mchid;
/**
* 回调地址url
*/
@TableField(value = "backurl")
@ApiModelProperty(value="回调地址url")
private String backurl;
/**
* 密钥
*/
@TableField(value = "`key`")
@ApiModelProperty(value="密钥")
private String key;
/**
* 接口密钥
*/
@TableField(value = "api_key")
@ApiModelProperty(value="接口密钥")
private String apiKey;
/**
* 证书序列号值
*/
@TableField(value = "cert_serial_no")
@ApiModelProperty(value="证书序列号值")
private String certSerialNo;
/**
* apiclient_key.pem证书文件的绝对路径或者以classpath:开头的类路径.
*/
@TableField(value = "key_path")
@ApiModelProperty(value="apiclient_key.pem证书文件的绝对路径或者以classpath:开头的类路径.")
private String keyPath;
/**
* apiclient_cert.pem证书文件的绝对路径或者以classpath:开头的类路径.
*/
@TableField(value = "cert_path")
@ApiModelProperty(value="apiclient_cert.pem证书文件的绝对路径或者以classpath:开头的类路径.")
private String certPath;
/**
* 帐号状态0正常 1停用
*/
@TableField(value = "`status`")
@ApiModelProperty(value="帐号状态(0正常 1停用)")
private String status;
@TableField(value = "remark")
@ApiModelProperty(value="")
private String remark;
}

37
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java

@ -0,0 +1,37 @@
package com.bnyer.common.core.dto;
import com.bnyer.common.core.domain.UserVipRecord;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.util.Date;
@Getter
@Setter
@NoArgsConstructor
public class AddUserVipRecordDto extends BaseDto<UserVipRecord>{
@ApiModelProperty(value="用户id")
private Long userId;
@ApiModelProperty(value="用户手机号")
private String phone;
@ApiModelProperty(value="vip表id")
private Long vipId;
@ApiModelProperty(value="时长天数")
private Integer days;
@ApiModelProperty(value="vip名称")
private String vipName;
@ApiModelProperty(value = "vip类型名称")
private String vipTypeName;
@ApiModelProperty(value = "用户客户端类型:10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
private Integer userClientType;
}

6
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AiPaintPageDto.java

@ -14,9 +14,13 @@ import javax.validation.constraints.NotNull;
public class AiPaintPageDto extends BasePageDto {
@NotEmpty(message = "平台渠道不能为空!")
@ApiModelProperty(value="平台渠道")
@ApiModelProperty(value="平台渠道(1->抖音;2->快手;3->微信)")
private String source;
@NotEmpty(message = "app类型不能为空!")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
@NotNull(message = "绘图者id不能为空!")
@ApiModelProperty(value="绘图者id")
private Long painterId;

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java

@ -34,7 +34,7 @@ public class BannerDto implements Serializable {
private String bannerUrl;
@NotNull(message = "平台渠道不能为空!")
@ApiModelProperty(value="平台(0->通用;1->抖音;2->快手;3->微信)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String source;
public Banner extractParam(){

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerPageDto.java

@ -13,7 +13,7 @@ public class BannerPageDto extends BasePageDto {
@ApiModelProperty(value="banner名称")
private String bannerName;
@ApiModelProperty(value="平台渠道")
@ApiModelProperty(value="平台渠道(1->抖音;2->快手;3->微信)")
private String source;
@ApiModelProperty(value="是否显示")

83
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BaseDto.java

@ -0,0 +1,83 @@
package com.bnyer.common.core.dto;
import com.bnyer.common.core.domain.BaseDomain;
import com.bnyer.common.core.utils.StringUtils;
import com.bnyer.common.core.utils.bean.ReflectUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @author :WXC
* @Date :2023/05/10
* @description :
*/
@Data
public class BaseDto <T extends BaseDomain> implements Serializable {
private static final long serialVersionUID = 320272502336434381L;
/**
* 主键ID
*/
private Long id;
/**
* 数据创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 数据更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 是否显示
*/
private String isShow;
/**
* 排序
*/
private Integer sort;
/**
* 主键ID集合
*/
private List<Long> ids;
/**
* 转为实体类
*
* @return 实体类
*/
public T toEntity() {
Class<T> entity = ReflectUtils.getParameterizedType(this.getClass());
T entityInstance = ReflectUtils.newInstance(entity);
BeanUtils.copyProperties(this, entityInstance);
if (this.id == null) {
entityInstance.setIsShow("1");
entityInstance.setCreateTime(new Date());
entityInstance.setUpdateTime(null);
if (StringUtils.isNotBlank(this.isShow)){
entityInstance.setIsShow(this.isShow);
}else {
entityInstance.setIsShow("1");
}
if (this.sort != null){
entityInstance.setSort(this.sort);
}else {
entityInstance.setSort(0);
}
} else {
entityInstance.setUpdateTime(new Date());
}
return entityInstance;
}
}

4
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java

@ -30,11 +30,11 @@ public class CreatorProfitAdInsertDto implements Serializable {
private Long imgId;
@NotBlank(message = "结算平台不能为空!")
@ApiModelProperty(value="结算平台(0->抖音;1->快手;2->微信;3->uniapp)")
@ApiModelProperty(value="结算平台(1->抖音;2->快手;3->微信)")
private String platform;
@NotBlank(message = "应用类型不能为空!")
@ApiModelProperty(value="应用类型(0->次元意境)")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
@NotNull(message = "用户id不能为空!")

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java

@ -36,7 +36,7 @@ public class CreatorProfitInviteInsertDto implements Serializable {
private String platform;
@NotBlank(message = "应用类型不能为空!")
@ApiModelProperty(value="应用类型(0->次元意境)")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
public CreatorProfit extractParam(){

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitPageDto.java

@ -16,7 +16,7 @@ public class CreatorProfitPageDto extends BasePageDto {
@ApiModelProperty(value="收益人/邀请人搜索码")
private String scanCode;
@ApiModelProperty(value="结算平台(0->抖音;1->快手;2->微信;3->uniapp)")
@ApiModelProperty(value="结算平台(1->抖音;2->快手;3->微信)")
private String platform;
@ApiModelProperty(value="应用类型(0->次元意境)")

4
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java

@ -43,11 +43,11 @@ public class CreatorProfitUpdateDto implements Serializable {
private BigDecimal profit;
@NotBlank(message = "结算平台不能为空!")
@ApiModelProperty(value="结算平台(0->抖音;1->快手;2->微信;3->uniapp)")
@ApiModelProperty(value="结算平台(1->抖音;2->快手;3->微信)")
private String platform;
@NotBlank(message = "应用类型不能为空!")
@ApiModelProperty(value="应用类型(0->次元意境)")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
@NotBlank(message = "收益类型不能为空!")

21
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/DiamondLogPageDto.java

@ -0,0 +1,21 @@
package com.bnyer.common.core.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@ApiModel("意心记录分页接收类")
public class DiamondLogPageDto extends BasePageDto {
@ApiModelProperty(value="用户id")
private Long userId;
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String source;
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
}

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackPageDto.java

@ -11,7 +11,7 @@ import lombok.Setter;
@ApiModel("feedback分页接收类")
public class FeedBackPageDto extends BasePageDto {
@ApiModelProperty(value="平台渠道")
@ApiModelProperty(value="平台渠道(1->抖音;2->快手;3->微信)")
private String source;
@ApiModelProperty(value="是否显示")

6
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhLoginDto.java

@ -14,7 +14,7 @@ import java.io.Serializable;
public class FhLoginDto implements Serializable {
@NotNull(message = "code不能为空!")
@ApiModelProperty(value = "微信code")
@ApiModelProperty(value = "快手code")
private String code;
@NotNull(message = "加密数据不能为空!")
@ -24,4 +24,8 @@ public class FhLoginDto implements Serializable {
@NotNull(message = "加密算法向量不能为空!")
@ApiModelProperty(value = "加密算法向量")
private String iv;
@NotNull(message = "appType不能为空!")
@ApiModelProperty(value="应用类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
}

26
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/GeneratePaintCdkDto.java

@ -0,0 +1,26 @@
package com.bnyer.common.core.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
@Getter
@Setter
@ApiModel("生成画意值cdk接收类")
public class GeneratePaintCdkDto implements Serializable {
@NotNull(message = "app类型不能为空!")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
@NotNull(message = "生成数量不能为空!")
@ApiModelProperty(value="生成数量")
private int paintNum;
}

31
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/GetGoldDto.java

@ -0,0 +1,31 @@
package com.bnyer.common.core.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
@Getter
@Setter
@ApiModel("签到获取画意值接收类")
public class GetGoldDto implements Serializable {
private static final long serialVersionUID = -522268377128588554L;
@NotNull(message = "用户id不能为空!")
@ApiModelProperty(value="用户id")
private Long userId;
@NotBlank(message = "应用类型不能为空!")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
@NotNull(message = "平台渠道不能为空!")
@ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
private String source;
}

21
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/GoldLogPageDto.java

@ -0,0 +1,21 @@
package com.bnyer.common.core.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@ApiModel("画意值记录分页接收类")
public class GoldLogPageDto extends BasePageDto {
@ApiModelProperty(value="用户id")
private Long userId;
@ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)")
private String source;
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
}

6
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PaintCdkUseDto.java

@ -1,7 +1,5 @@
package com.bnyer.common.core.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -25,10 +23,10 @@ public class PaintCdkUseDto implements Serializable {
private Long userId;
@NotNull(message = "平台渠道不能为空!")
@ApiModelProperty(value="平台(0->hub;1->抖音;2->快手;3->微信)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String source;
@NotNull(message = "应用不能为空!")
@ApiModelProperty(value="应用(0->次元意境)")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
}

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PayUserVipDto.java

@ -21,7 +21,7 @@ public class PayUserVipDto implements Serializable {
@NotNull(message = "用户vipId不能为空!")
@ApiModelProperty(value="用户vip表id")
private Long userVipId;
private Long vipId;
@NotBlank(message = "vip类型状态不能为空!")
@ApiModelProperty(value="vip类型状态(0->月卡;1->季卡;2->年卡)")

4
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java

@ -37,9 +37,9 @@ public class ProfitVerifyOrderDto implements Serializable {
@ApiModelProperty(value="昨日收益")
private BigDecimal amt;
@ApiModelProperty(value="平台(0->抖音;1->快手)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String platform;
@ApiModelProperty(value="应用(0->bnyer)")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
}

4
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderInsertDto.java

@ -20,9 +20,9 @@ public class ProfitVerifyOrderInsertDto implements Serializable {
@ApiModelProperty(value="创建订单管理员id")
private Long adminId;
@ApiModelProperty(value="平台(0->抖音;1->快手)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String platform;
@ApiModelProperty(value="应用")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
}

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java

@ -29,6 +29,6 @@ public class ProfitVerifyOrderUpdateDto implements Serializable {
@ApiModelProperty(value="修改管理员id")
private Long updateAdminId;
@ApiModelProperty(value="平台(0->抖音;1->快手)")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String platform;
}

28
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgDto.java

@ -25,9 +25,30 @@ public class TextToImgDto implements Serializable {
@ApiModelProperty(value="提示词")
private String prompt;
@ApiModelProperty(value="反向提示词")
private String negativePrompt;
@ApiModelProperty(value="模型")
private String modelName;
@ApiModelProperty(value="采样步数")
private Integer steps;
@ApiModelProperty(value="种子值")
private Integer seed;
@ApiModelProperty(value="精细度")
private Double cfgScale;
@ApiModelProperty(value="批量数量")
private Integer batchSize;
@ApiModelProperty(value="差异强度值")
private Double eta;
@ApiModelProperty(value="采样器")
private String samplerIndex;
@ApiModelProperty(value="风格名称")
private String styleName;
@ -37,10 +58,13 @@ public class TextToImgDto implements Serializable {
@ApiModelProperty(value="绘图者昵称")
private String painterName;
@ApiModelProperty(value="应用")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
@ApiModelProperty(value="平台")
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String platform;
@ApiModelProperty(value="消耗画意值")
private int goldNum;
}

41
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TextToImgLoveDto.java

@ -0,0 +1,41 @@
package com.bnyer.common.core.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
@Getter
@Setter
@ApiModel("情侣头像接收类")
public class TextToImgLoveDto implements Serializable {
private static final long serialVersionUID = 3028022777339473876L;
@ApiModelProperty(value="内容提示词")
private String prompt;
@ApiModelProperty(value="场景提示词")
private String scenePrompt;
@ApiModelProperty(value="风格名称")
private String styleName;
@ApiModelProperty(value="绘图者id")
private Long painterId;
@ApiModelProperty(value="绘图者昵称")
private String painterName;
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
@ApiModelProperty(value="平台(1->抖音;2->快手;3->微信)")
private String platform;
@ApiModelProperty(value="消耗画意值")
private int goldNum;
}

4
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokLoginDto.java

@ -17,6 +17,10 @@ public class TiktokLoginDto implements Serializable {
@ApiModelProperty(value = "抖音code")
private String code;
@NotNull(message = "appType不能为空!")
@ApiModelProperty(value="应用类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
@NotNull(message = "加密数据不能为空!")
@ApiModelProperty(value = "加密数据")
private String encryptedData;

2
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java

@ -56,7 +56,7 @@ public class UserVipDto implements Serializable {
if(StringUtils.isNotBlank(this.getHotSignDesc())){
userVip.setHotSignDesc(this.getHotSignDesc());
}
userVip.setDays(this.getDays());
// userVip.setDays(this.getDays());
userVip.setIsDelay(this.getIsDelay());
return userVip;
}

5
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java

@ -40,7 +40,10 @@ public class WithdrawDto implements Serializable {
public WithdrawLog extractParam(){
WithdrawLog withdrawLog = new WithdrawLog();
BeanUtils.copyProperties(this,withdrawLog);
withdrawLog.setCreatorId(this.getCreatorId());
withdrawLog.setAccountNo(this.getAccountNo());
withdrawLog.setChannel(this.getChannel());
withdrawLog.setAmt(this.getAmt());
return withdrawLog;
}
}

5
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxLoginDto.java

@ -6,6 +6,7 @@ import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
@Getter
@ -24,4 +25,8 @@ public class WxLoginDto implements Serializable {
@NotBlank(message = "加密算法向量不能为空!")
@ApiModelProperty(value = "加密算法向量")
private String iv;
@NotNull(message = "appType不能为空!")
@ApiModelProperty(value="应用类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
}

6
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java

@ -1,7 +1,5 @@
package com.bnyer.common.core.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@ -20,10 +18,10 @@ public class checkUserCanDownloadDto implements Serializable {
private Long userId;
@NotNull(message = "平台不能为空!")
@ApiModelProperty(value="平台")
@ApiModelProperty(value="平台(0->抖音;1->快手;2->微信)")
private String platform;
@NotNull(message = "应用不能为空!")
@ApiModelProperty(value="应用")
@ApiModelProperty(value="app类型(0->次元意境;1->妙鸭壁纸)")
private String appType;
}

25
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumAppType.java

@ -0,0 +1,25 @@
package com.bnyer.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Objects;
/**
* @author :penny
* @description : app类型枚举
*/
@Getter
@AllArgsConstructor
public enum EnumAppType {
YJ_APP("0","次元意境"),
MY_APP("1","妙鸭壁纸"),
;
private final String code;
private final String msg;
}

22
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumMessageStatus.java

@ -0,0 +1,22 @@
package com.bnyer.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author :WXC
* @Date :2023/05/18
* @description :消息状态
*/
@Getter
@AllArgsConstructor
public enum EnumMessageStatus {
//处理中
PROCESS,
//成功
SUCCESS,
//失败,
FAILS,
//作废
INVALID,
}

18
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumMessageType.java

@ -0,0 +1,18 @@
package com.bnyer.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author :WXC
* @Date :2023/05/18
* @description :消息类型
*/
@Getter
@AllArgsConstructor
public enum EnumMessageType {
//普通
GENERAL,
//延时
DELAY
}

31
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumPayStatus.java

@ -0,0 +1,31 @@
package com.bnyer.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
/**
* @author :WXC
* @description :
*/
@Getter
@AllArgsConstructor
public enum EnumPayStatus {
NO_PAY(1000,"未支付"),
SUCCESS(1001,"已支付"),
FAILS(1002,"支付失败"),
;
private final int status;
private final String name;
public static EnumPayStatus getEnumPayStatusByStatus(int status) {
return Arrays.stream(values())
.filter(payStatus -> payStatus.getStatus() == status)
.findFirst().orElseThrow(() -> new SecurityException("status 未匹配上对应的支付状态"));
}
}

42
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumPayType.java

@ -0,0 +1,42 @@
package com.bnyer.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Objects;
/**
* @author :WXC
* @description :
*/
@Getter
@AllArgsConstructor
public enum EnumPayType {
WX_PAY("wxpay","微信支付"),
ALI_PAY("alipay","支付宝支付"),
DY_PAY("dypay","抖音支付"),
KS_PAY("kspay","快手支付"),
;
private final String type;
private final String name;
public static String getName(String type) {
for (EnumPayType s : EnumPayType.values()) {
if (Objects.equals(type, s.getType())) {
return s.getName();
}
}
return null;
}
public static EnumPayType getEnumPayTypeByType(String type) {
return Arrays.stream(values())
.filter(payType -> Objects.equals(payType.getType(), type))
.findFirst().orElseThrow(() -> new SecurityException("type 未匹配上对应的支付方式"));
}
}

32
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumRefundStatus.java

@ -0,0 +1,32 @@
package com.bnyer.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
/**
* @author :WXC
* @description :
*/
@Getter
@AllArgsConstructor
public enum EnumRefundStatus {
NO_REFUND(1000,"未退款"),
FAILS(1001,"退款失败"),
SUCCESS(1002,"退款成功"),
PROCESS(1003,"退款中"),
;
private final int status;
private final String name;
public static EnumRefundStatus getEnumStatusByStatus(int status) {
return Arrays.stream(values())
.filter(payStatus -> payStatus.getStatus() == status)
.findFirst().orElseThrow(() -> new SecurityException("status 未匹配上对应的支付状态"));
}
}

38
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumSceneCode.java

@ -0,0 +1,38 @@
package com.bnyer.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
/**
* @author :WXC
* @description :
*/
@Getter
@AllArgsConstructor
public enum EnumSceneCode {
VIP_RECHARGE(1,"会员充值"),
UNKNOWN(-1,"未知"),
;
private final int sceneCode;
private final String name;
public static String getSceneCodeName(int sceneCode) {
for (EnumSceneCode s : EnumSceneCode.values()) {
if (sceneCode == s.getSceneCode()) {
return s.getName();
}
}
return null;
}
public static EnumSceneCode getSceneCodeByCode(int code) {
return Arrays.stream(values())
.filter(sceneCode -> sceneCode.getSceneCode() == code)
.findFirst().orElse(EnumSceneCode.UNKNOWN);
}
}

36
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumTimeUnit.java

@ -0,0 +1,36 @@
package com.bnyer.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
/**
* @author :WXC
* @Date :2023/04/23
* @description :时间单位
*/
@Getter
@AllArgsConstructor
public enum EnumTimeUnit {
DAY(0,"天"),
WEEK(1,"周"),
MONTH(2,"月"),
QUARTER(3,"季"),
YEAR(4,"年"),
HOURS(5,"时"),
MINUTE(6,"分"),
SECONDS(7,"秒"),
;
private final int unit;
private final String name;
public static EnumTimeUnit getEnumTimeUnitByUnit(int unit) {
return Arrays.stream(values())
.filter(vipTimeUnit -> unit == vipTimeUnit.getUnit())
.findFirst().orElseThrow(() -> new SecurityException("unit 未匹配上对应的时间单位"));
}
}

51
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumUserClientType.java

@ -0,0 +1,51 @@
package com.bnyer.common.core.enums;
import com.bnyer.common.core.exception.ServiceException;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Objects;
/**
* @author :WXC
* @description :
*/
@Getter
@AllArgsConstructor
public enum EnumUserClientType {
DU(10,"DU","抖音用户"),
KU(20,"KU","快手用户"),
WU(30,"WU","微信用户"),
WY(40,"WY","微信艺术家"),
PU(50,"PU","pc管理员")
;
private final int type;
private final String code;
private final String desc;
public static String getCodeByType(int type) {
for (EnumUserClientType s : EnumUserClientType.values()) {
if (type == s.type) {
return s.getCode();
}
}
throw new ServiceException("userClientType 未匹配上对应的类型");
}
public static EnumUserClientType getEnumByType(Integer type) {
return Arrays.stream(values())
.filter(userClientType -> userClientType.getType() == type)
.findFirst().orElseThrow(() -> new ServiceException("type 未匹配上对应的客户端类型"));
}
public static EnumUserClientType getTypeByCode(String code) {
return Arrays.stream(values())
.filter(type -> Objects.equals(type.getCode(), code))
.findFirst().orElse(EnumUserClientType.PU);
}
}

34
bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/EnumVipOrderStatus.java

@ -0,0 +1,34 @@
package com.bnyer.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author :WXC
* @description :
*/
@Getter
@AllArgsConstructor
public enum EnumVipOrderStatus {
WAIT_PAY(0,"待付款"),
SUCCESS(1,"已付款"),
REFUNDED(2,"已退款"),
PAY_TIMEOUT_CLOSE(3,"支付超时取消"),
CANCEL_CLOSE(4,"买家取消"),
;
private final int status;
private final String name;
public static String getStatusName(int status) {
for (EnumVipOrderStatus s : EnumVipOrderStatus.values()) {
if (status == s.status) {
return s.getName();
}
}
return null;
}
}

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save