huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 07:41:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,984 Commits 1 Branch 0 Tags 176 MiB
437185cb1d
Commit Graph

795 Commits

Author SHA1 Message Date
jason
437185cb1d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-25 10:48:32 +08:00
jason
6fcff0863a 支付宝统一退款接口 subCode == ACQ.SYSTEM_ERROR 返回 WAITING 状态 2023-09-25 10:43:23 +08:00
YunaiV
e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
jason
0f0e6eb8ba Pay Client 新增转账接口 2023-09-25 08:34:58 +08:00
owen
e9fd377772 分销：Review代码修改 2023-09-24 20:28:44 +08:00
YunaiV
421bb7d154 code review：分销逻辑 2023-09-24 11:56:00 +08:00
owen
f7296d18b9 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
 2023-09-24 10:10:53 +08:00
owen
29b806e675 Framework：增加LocalDate、LocalTime序列化 2023-09-24 09:57:09 +08:00
owen
f30fa39067 修改Review代码 2023-09-22 23:15:10 +08:00
puhui999
6ef94ade6a 完善订单和活动 review 提到的问题 2023-09-20 16:06:29 +08:00
YunaiV
c766f7daa5 code review：砍价、秒杀的逻辑 2023-09-20 01:07:41 +08:00
YunaiV
2278ad4652 Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
 2023-09-20 00:03:18 +08:00
YunaiV
8cfb738db3 code review：分销逻辑 2023-09-19 22:16:25 +08:00
puhui999
408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 18:57:28 +08:00
owen
a3e8b42be6 trade: 分销业务review代码修改 2023-09-19 16:37:51 +08:00
YunaiV
314dee430e bugfix：微信公众号登录报 access token 的问题 2023-09-11 11:06:42 +08:00
芋道源码
3b5215db21
!611 分销用户管理、Review代码修改 
Merge pull request !611 from 疯狂的世界/brokerate
 2023-09-09 00:48:00 +00:00
YunaiV
87c55784c4 code review：营销活动+订单 2023-09-09 01:27:55 +08:00
owen
ddcebb1986 common: MoneyUtils 移到 common 模块 2023-09-08 12:46:43 +08:00
puhui999
5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-08 00:59:53 +08:00
YunaiV
5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
YunaiV
eb342d5abf Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2023-09-06 23:50:55 +08:00
YunaiV
bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2023-09-06 21:40:53 +08:00
puhui999
2591ab5d36 订单中心+营销活动：完善部分 TODO 提到的问题 2023-09-06 11:29:51 +08:00
jason
4a0fa2a3a4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-06 08:50:33 +08:00
jason
3f51be6a2d 钱包。删除不需要的类 2023-09-06 08:50:22 +08:00
YunaiV
e4b153a866 分佣：增加获得分销排行分页 API mock 2023-09-05 23:49:35 +08:00
YunaiV
5308e309ea 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files 2023-09-03 18:44:03 +08:00
YunaiV
4db3de8d86 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-09-03 18:30:46 +08:00
芋道源码
a1f6826e14
Merge pull request #337 from freesme/fix-master-#319-wx-pay-client-error 
修复：#319 微信支付初始化 client 客户端错误，导致发起支付报错
 2023-09-03 18:30:32 +08:00
YunaiV
b69d4e0852 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-09-03 17:59:50 +08:00
芋道源码
7870283bfa
!594 兼容spring web 配置上下文根路径的情况 
Merge pull request !594 from suyh/master
 2023-09-03 09:55:39 +00:00
owen
6a7be19d3a common: 增加InEnumCollectionValidator，用于校验枚举值列表参数的取值范围是否有䇅 2023-09-02 08:44:02 +08:00
YunaiV
d982a95fdd Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-31 20:38:59 +08:00
YunaiV
ba444c9538 code review：支付钱包 2023-08-31 20:13:12 +08:00
jason
457312d5aa 修改 PayClientFactory 创建 PayClient 方法 2023-08-31 14:30:12 +08:00
jason
7d4d3bea55 Revert "创建 PayClient 迁移到 PayChannelService" 
This reverts commit 716727bfa7.
 2023-08-31 08:27:22 +08:00
jason
716727bfa7 创建 PayClient 迁移到 PayChannelService 2023-08-29 15:28:24 +08:00
Krane
e8662e35e1 修复：微信支付初始化 client 客户端错误，导致发起支付报错 2023-08-29 11:45:04 +08:00
YunaiV
6132443d26 code review：钱包实现 2023-08-28 18:54:40 +08:00
jason
7237bc07bb 钱包退款的实现 2023-08-28 10:25:50 +08:00
jason
c7f6f92159 钱包支付 Client 的实现 2023-08-28 07:39:03 +08:00
YunaiV
8b98d13d8b Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-27 21:05:42 +08:00
YunaiV
1baa7f4aee 优化 AlipayPcPayClientTest 的方法命名，补全 assert 断言 2023-08-27 16:33:19 +08:00
YunaiV
35c1ba44d3 优化 AbstractAlipayClientTest、AlipayBarPayClientTest 的方法命名，补全 assert 断言 2023-08-27 16:15:41 +08:00
苏云弘
2acf5c878f 兼容spring boot web 提供的上下文根路径的匹配 
spring.servlet.content-path
 2023-08-27 11:59:38 +08:00
YunaiV
3dd273a30d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-27 11:10:57 +08:00
YunaiV
7d99c6dbe8 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-08-27 10:52:37 +08:00
芋道源码
544e650e15
Merge pull request #326 from Lemon-cc-hang/base 
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
 2023-08-27 10:52:15 +08:00
YunaiV
acee734554 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-08-27 10:44:48 +08:00