Commit Graph

  • a6437b7cc5 mall + pay: 1. 后台的收银台,接入微信扫码支付 YunaiV 2023-07-15 21:18:36 +08:00
  • c44ace6011 mall + pay: 1. 完成支付宝的退款重构 2. 完成 demo 模块的退款接入 YunaiV 2023-07-15 20:36:04 +08:00
  • 518e89dc4b mall + pay: 1. 重构支付回调的逻辑,将回调解析改成 PayOrderRespDTO,为后续轮询做铺垫 2. 调整退款单的表结构 3. 调整退款调用的实现 YunaiV 2023-07-15 10:35:41 +08:00
  • 1c3521c5fa update yudao-ui-admin/src/components/VideoUpload/index.vue. 修复修改后再新增时的表单无法清除还原到未选择视频文件状态的问题 zbk 2023-07-14 09:56:15 +00:00
  • 147cd271b8 fix:完善拼团活动列表展示 puhui999 2023-07-14 17:34:37 +08:00
  • 7cdb321fe4 fix:完善拼团活动CRUD puhui999 2023-07-14 17:08:37 +08:00
  • 927f71c7e2 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-07-14 14:28:26 +08:00
  • fbb63ee262 mall + pay: 1. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:MySQL 时间的精度问题; YunaiV 2023-07-12 22:40:39 +08:00
  • 47ba5b7b44 by gateway: 支付渠道的代码优化 zhijiantianya@gmail.com 2023-07-12 20:34:43 +08:00
  • 35ceef371c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product zhijiantianya@gmail.com 2023-07-12 12:52:58 +08:00
  • 052e4689ee by gateway: 支付应用的代码优化 zhijiantianya@gmail.com 2023-07-12 12:52:48 +08:00
  • 0ac599a3d9 mall + pay: 1. 修复支付宝沙箱地址的调整 2. 收银台的前端 URL 支付走整个网页跳转 3. 收银台的支付成功后,增加 returnUrl 回跳 4. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:租户未传递; YunaiV 2023-07-12 00:04:19 +08:00
  • f1c4c7964a gateway commit test zhijiantianya@gmail.com 2023-07-11 21:18:24 +08:00
  • cad508def6 mall + pay: 1. bar 扫码支付成功后,额外返回 notify 2. notify 在支付回调时,增加幂等处理 YunaiV 2023-07-10 23:06:00 +08:00
  • ca4afc2909 mall + pay: 1. 调整 cashier 的 channels 的读取实现方式 YunaiV 2023-07-10 18:28:43 +08:00
  • 2485a5ebc9 mall + pay: 1. 将 amount 统一都修改成 price 2. 将 payed 统一改成 payStatus YunaiV 2023-07-10 17:35:26 +08:00
  • e7d8643665 fix:修复 mall review @puhui999 puhui999 2023-07-10 16:35:49 +08:00
  • 0134375401 update yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm. 赤鷹 2023-07-10 08:23:58 +00:00
  • 0fa3ed9421 update yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm. 赤鷹 2023-07-10 08:09:40 +00:00
  • 9cbd0fec1c Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-07-10 09:21:26 +08:00
  • 5d2d52020e mall + pay:简化 pay 的复杂度 1. 移除 merchant 表设计 2. 移除 app 和 channel 的导出 YunaiV 2023-07-09 12:40:26 +08:00
  • 4682650e11 mall + pay: 1. 先添加 WxAppPayClient、WxH5PayClient 的类,暂未实现 YunaiV 2023-07-09 00:47:31 +08:00
  • b06a21f9af mall + pay: 1. 实现 WxNativePayClient 的支付功能 YunaiV 2023-07-09 00:36:40 +08:00
  • e31b40eefa mall + pay: 1. 实现 WxBarPayClient 的支付功能 YunaiV 2023-07-08 23:37:25 +08:00
  • 4014137a4c mall + pay:调整异常的处理 1. 在 PayOrderUnifiedRespDTO 增加 status 字段,用于后续微信付款码支付时,直接支付成功的场景。 YunaiV 2023-07-08 22:40:27 +08:00
  • efb221b1fe mall + pay:调整异常的处理 1. 如果是业务异常,则统一转换成 ServiceException 2. 如果是系统异常,则使用 PayException 包装成无需 check 的异常 YunaiV 2023-07-08 19:26:42 +08:00
  • e615be971e mall + pay: 1、测试通过微信小程序支付 YunaiV 2023-07-08 12:44:50 +08:00
  • d76bc7aa82 mall + pay: 1、初步完成微信扫码支付,暂时缺少状态的处理 YunaiV 2023-07-08 00:08:05 +08:00
  • 284506b356 mall 下单日志 chenchen 2023-07-07 14:06:32 +08:00
  • f492797fba update 售后日志 chenchen 2023-07-06 16:04:18 +08:00
  • eaeb435459 交易日志sql chenchen 2023-06-29 21:44:36 +08:00
  • 2865c28a9f 售后日志优化,map->抽方法 chenchen 2023-06-27 23:07:06 +08:00
  • 75afab1f86 售后日志优化 chenchen 2023-06-25 23:08:07 +08:00
  • 3f33ca2d6b mall + pay: 1、增加获得支付渠道接口 YunaiV 2023-07-06 23:16:53 +08:00
  • d224b6b9be mall + pay: 1、调整微信 Lite 小程序支付的实现 YunaiV 2023-07-06 20:55:23 +08:00
  • cbc61184bd mall + pay: 1、优化微信公众号 MP 支付的实现 YunaiV 2023-07-06 19:11:32 +08:00
  • 67d60e32f8 mall + pay: 1、调整微信支付,修复 v2 传递的时间不正确 2、调整 mp js ticket 接口到 system 模块 YunaiV 2023-07-06 00:19:05 +08:00
  • b697ee3298 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-07-05 22:08:12 +08:00
  • b78f814552 fix:mall promotion SeckillActivity puhui999 2023-07-05 22:05:05 +08:00
  • 78b3d2a20f fix:mall promotion Combination puhui999 2023-07-05 11:31:16 +08:00
  • 20eb0a2a88 mall + pay: 1、调整 returnUrl 的实现 YunaiV 2023-07-04 23:43:16 +08:00
  • 41d996f7f3 feat:mall promotion CombinationProduct puhui999 2023-07-04 11:21:03 +08:00
  • c563051841 feat:mall product 新增通过 spuIds 获取相关 spu 详情列表的接口 puhui999 2023-07-03 14:44:27 +08:00
  • 409ec555e8 feat:mall CombinationActivity puhui999 2023-07-03 08:07:05 +08:00
  • 23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product YunaiV 2023-07-02 23:45:48 +08:00
  • 08e9772f66 !529 回退 'Pull Request !518 : 添加华为云 maven 升级依赖' Merge pull request !529 from 芋道源码/revert-merge-518-master 芋道源码 2023-07-02 15:41:47 +00:00
  • 11c4c950b7 回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 芋道源码 2023-07-02 15:41:26 +00:00
  • 6b42efd786 !518 添加华为云 maven 升级依赖 Merge pull request !518 from xingyu/feature/captcha 芋道源码 2023-07-02 15:32:13 +00:00
  • 040a66965c mall + member: 1、review 积分 YunaiV 2023-07-02 23:19:13 +08:00
  • 2f42964a96 !524 会员中心合并至member 模块 Merge pull request !524 from QingX/feature/mall_product 芋道源码 2023-07-02 13:51:00 +00:00
  • 9b90320985 mall + trade: 1、增加配送信息 YunaiV 2023-07-02 12:55:15 +08:00
  • 1b558a02b0 修复member_user pg脚本中没有默认值导致创建用户失败的bug congqing 2023-07-02 01:33:59 +08:00
  • 6fc724545b mall + trade: 1、取消订单 mock 接口 2、删除订单 mock 接口 YunaiV 2023-07-02 00:15:28 +08:00
  • 6206dd94e2 mall + trade: 1、获取订单结算信息,增加门店自提编号 YunaiV 2023-07-01 00:26:09 +08:00
  • 0a20f7fe9e Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product YunaiV 2023-06-30 22:45:09 +08:00
  • 3750dc76c7 mall + trade: 1、获取订单结算信息,增加积分的 mock 返回 YunaiV 2023-06-30 22:45:03 +08:00
  • 3a1e5c1b5f pay : 会员电子钱包表结构 jason 2023-06-30 10:24:36 +08:00
  • ef656cf762 mall + promotion: 1、增加获得符合条件的优惠劵 YunaiV 2023-06-29 20:20:00 +08:00
  • b3c1be108c mall + trade: 1、增加门店自提的 mock 接口 YunaiV 2023-06-29 00:24:45 +08:00
  • a918b54b28 Merge remote-tracking branch 'origin/dev-fix-sql4pg' into master-cq congqing 2023-06-29 00:01:58 +08:00
  • c1e020a286 将master数据库中pg数据库的引用数据库名称变量改为master congqing 2023-06-28 23:28:19 +08:00
  • 0200fa6e53 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product xiaqing 2023-06-28 22:55:53 +08:00
  • c7ced55a6c 会员中心代码、sql脚本提交 1.合并积分模块只member module 2.初始化sql放入mysql/member_point.sql 3.添加会员中/会员积分、会员签到/xxx层级目录 4.删除无用的接口代码 xiaqing 2023-06-28 22:49:19 +08:00
  • 5ffea93731 mall + product: 1、完善商品评论列表的 mock YunaiV 2023-06-28 00:25:44 +08:00
  • 846405d8b1 mall + promotion: 1、增加 article mock 接口 YunaiV 2023-06-27 22:44:38 +08:00
  • 3e9768374b chore: up justauth 1.0.1 captcha-plus 1.0.5 xingyu 2023-06-26 22:19:20 +08:00
  • 7ad3b6ad2b chore: use com.xingyuv.justauth xingyu 2023-06-26 21:08:56 +08:00
  • 7036a6652c mall + member: 1、调整收获地址的返回 YunaiV 2023-06-26 20:07:46 +08:00
  • 8ea46b8fc2 fix: getNewPhoneNoInfo 已过期 xingyu 2023-06-26 16:53:08 +08:00
  • 9826bd614b docs: up Lombok 1.18.28 xingyu 2023-06-26 16:50:41 +08:00
  • c1782c432f chore: up deps version xingyu 2023-06-26 16:50:20 +08:00
  • d44c29296d chore: up hutool 5.8.20 Lombok 1.18.28 xingyu 2023-06-26 16:49:33 +08:00
  • 4393c5da1c docs: up Druid 1.2.18 xingyu 2023-06-26 16:30:00 +08:00
  • 02fe0329e4 chore: up druid 1.2.18 xingyu 2023-06-26 16:29:26 +08:00
  • 0899f5fd29 docs: up springboot 2.10.12 xingyu 2023-06-26 16:27:06 +08:00
  • bdb18b4ced chore: up springboot 2.7.13 xingyu 2023-06-26 16:26:38 +08:00
  • 5c9a99c83e mall + promotion: 1、mock 优惠劵模版分页 2、mock 批量删除收藏 YunaiV 2023-06-25 17:40:04 +08:00
  • e5c556f106 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product xiaqing 2023-06-25 15:49:30 +08:00
  • bb0bb2a4fa mall + promotion:商品列表 YunaiV 2023-06-25 11:25:13 +08:00
  • 4a3703e302 mall + promotion:review 页面装修 YunaiV 2023-06-25 11:24:55 +08:00
  • 050f0bb6a2 页面装修 review 修改 jason 2023-06-24 21:09:49 +08:00
  • b582206003 mall + promotion:review 页面装修 YunaiV 2023-06-24 12:54:59 +08:00
  • ad1f656dfa 页面装修修改,后端只负责存取 jason 2023-06-24 00:10:55 +08:00
  • 1dfbe45913 mall + order:review 售后日志 YunaiV 2023-06-23 21:50:57 +08:00
  • 07884ef423 Merge branch 'mall_trade_aftersalelog' of https://gitee.com/chen934298133/ruoyi-vue-pro into feature/mall_product YunaiV 2023-06-23 21:37:21 +08:00
  • bc54e2fb35 mall + order:订单详情 YunaiV 2023-06-23 21:34:30 +08:00
  • b92ed60136 !519 订单详情后端修改 Merge pull request !519 from 矿泉水/feature/mall_product 芋道源码 2023-06-23 13:30:53 +00:00
  • 2efdbf93cb mall + promotion:review 秒杀、评论代码 YunaiV 2023-06-23 21:14:36 +08:00
  • b16632ea41 !522 mall seckill Merge pull request !522 from puhui999/feature/mall_product 芋道源码 2023-06-23 06:04:47 +00:00
  • 6b1d996b66 页面装修数据结构定义 jason 2023-06-23 10:53:29 +08:00
  • 26f563df57 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-06-23 00:57:49 +08:00
  • ab30ff6480 fix:完善 mall seckill 相关 ② puhui999 2023-06-23 00:57:27 +08:00
  • b0fcd96dfe mall + promotion:增加砍价记录的 mock YunaiV 2023-06-23 00:26:04 +08:00
  • f5b2bb4d7d mall + promotion:增加砍价记录的 mock YunaiV 2023-06-22 23:06:16 +08:00
  • c33bd38b5d mall + promotion:增加砍价记录的 mock YunaiV 2023-06-21 23:45:59 +08:00
  • b44ad3a0f7 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product puhui999 2023-06-21 08:42:36 +08:00
  • 666925da6e fix:mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED puhui999 2023-06-21 08:41:45 +08:00
  • 772a982b5f mall + promotion:增加拼团记录的 mock YunaiV 2023-06-21 00:29:50 +08:00
  • 700d95a43d fix:完善商品评论 review 提到的问题 puhui999 2023-06-20 18:12:39 +08:00
  • 8dfb298376 fix:完善 mall seckill 相关 ① puhui999 2023-06-20 09:08:15 +08:00