huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-12-02 04:01:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,265 Commits 1 Branch 0 Tags 176 MiB
435d7dcfca
Commit Graph

5265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
owen
0a3a6825d5 优惠券：完善APP优惠券查询接口 2023-09-26 20:44:22 +08:00
YunaiV
ad535e674f trade：积分相关的价格计算 2023-09-26 20:11:54 +08:00
YunaiV
a8c78f3097 trade：增加自动收货的 job 2023-09-26 19:27:37 +08:00
owen
a431bccc02 分销：Review代码修改 2023-09-26 15:11:48 +08:00
YunaiV
9e99b04375 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-26 00:04:18 +08:00
YunaiV
826d792ff2 trade：增加自动取消的 job 2023-09-26 00:04:11 +08:00
puhui999
bce96b29a6 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
 2023-09-25 15:06:57 +08:00
puhui999
42c47d9b44 秒回活动：订单金额计算初步设计 2023-09-25 14:56:56 +08:00
YunaiV
f088fdff84 code review：委托逻辑 2023-09-25 13:59:44 +08:00
芋道源码
8649b285cf
!631 【工作流】委派 
Merge pull request !631 from Youkehai/feature/bpm-delegate
 2023-09-25 05:42:12 +00:00
youkehai
3972fbd1d9 fix: 根据review结果修改 2023-09-25 11:30:44 +08:00
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
芋道源码
56c4595058
!633 up springboot 2.7.16 
Merge pull request !633 from xingyu/feature/v2.7.16
 2023-09-25 01:41:32 +00:00
YunaiV
e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
youkehai
1553900193 fix: 解决冲突 2023-09-25 09:22:11 +08:00
youkehai
d6e736bd56 Merge branch 'master' into feature/bpm-delegate 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
 2023-09-25 09:15:59 +08:00
芋道源码
c92365128a
!635 分销Review代码修改 
Merge pull request !635 from 疯狂的世界/feature/mall_product
 2023-09-25 00:39:16 +00:00
owen
16af31d980 分销：@Select sql语句增加逻辑删除字段过滤 2023-09-25 08:36:55 +08:00
jason
0f0e6eb8ba Pay Client 新增转账接口 2023-09-25 08:34:58 +08:00
owen
3dca66eefa 分销：提现统计 2023-09-25 08:05:29 +08:00
YunaiV
f864aa1cfd Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2023-09-24 23:25:14 +08:00
YunaiV
0669b9da34 Merge remote-tracking branch 'origin/master' 2023-09-24 23:24:32 +08:00
YunaiV
9b7c757942 1.8.2 版本发布 2023-09-24 23:24:24 +08:00
owen
0b84c18736 分销：修正分享海报 2023-09-24 23:18:51 +08:00
芋道源码
3a297271eb
!634 fix: MemberUserServiceImpl需要填充exception错误信息中的参数 
Merge pull request !634 from dhb52/master
 2023-09-24 15:09:19 +00:00
YunaiV
83a133b344 bpm：优化 BpmnModelUtils 2023-09-24 23:06:04 +08:00
owen
967e578d54 分销：重命名提现类型字段 2023-09-24 22:32:13 +08:00
owen
9856e17974 分销：根据商品，计算推广员可以得到的佣金 2023-09-24 22:27:24 +08:00
dhb52
96d4e7bc56 fix: 需要填充错误信息中的参数 2023-09-24 22:23:31 +08:00
YunaiV
ffdaf3a859 bpm：简化流程驳回的逻辑实现，提升可读性 2023-09-24 22:19:36 +08:00
owen
e9fd377772 分销：Review代码修改 2023-09-24 20:28:44 +08:00
xingyu
63fee66657 chore: update okio fix minio bug 2023-09-24 18:04:48 +08:00
xingyu
cfec4b12ca docs: update springboot 2.7.16 2023-09-24 17:46:48 +08:00
xingyu
13f135abe9 chore: update deps 2023-09-24 17:44:35 +08:00
xingyu
a98a7c7645 chore: lombok 1.18.30 2023-09-24 17:38:18 +08:00
xingyu
22041b6f8d chore: hutool 5.8.22 2023-09-24 17:36:42 +08:00
xingyu
8187398bdf chore: springboot 2.7.16 2023-09-24 17:36:09 +08:00
YunaiV
0b649fd3e1 bpm：简化获得可回退节点的实现 2023-09-24 16:08:50 +08:00
kehaiyou
4efa93b03b feat: 【工作流】--委派 2023-09-24 15:43:35 +08:00
芋道源码
3826846368
!629 工作流-》流程实例的任务节点回退 
Merge pull request !629 from Youkehai/master
 2023-09-24 07:17:51 +00:00
kehaiyou
921f99d39d fix: 方法，变量名词，注释规范 2023-09-24 13:13:55 +08:00
YunaiV
421bb7d154 code review：分销逻辑 2023-09-24 11:56:00 +08:00
jason
60f766f35c 钱包充值允许多次退款 2023-09-24 10:49:13 +08:00
芋道源码
51899c4c13
!627 trade: 分销业务 - 提现申请 
Merge pull request !627 from 疯狂的世界/brokerate
 2023-09-24 02:15:39 +00: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
芋道源码
b420c5b8fe
!630 对具有软删除的表去除UNIQUE INDEX 
Merge pull request !630 from dhb52/master
 2023-09-24 02:01:53 +00:00
芋道源码
9b8312f596
!626 发起流程成功后，用户流程列表未刷新 
Merge pull request !626 from samisgod/master
 2023-09-24 02:01:33 +00:00
owen
29b806e675 Framework：增加LocalDate、LocalTime序列化 2023-09-24 09:57:09 +08:00
芋道源码
798ae7c2c7
Merge pull request #344 from Shimada666/patch-1 
fix: 使初始化数据脚本兼容 mysql5.7
 2023-09-24 09:24:09 +08:00