杨宇庆
|
922aa0678d
|
【修复】修复当不存在优惠价格时，商城却显示优惠价格
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2024-10-16 16:32:50 +00:00 |
|
YunaiV
|
46a0d4f6af
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantDatabaseInterceptor.java
|
2024-10-13 17:00:43 +08:00 |
|
YunaiV
|
081ef0502c
|
【代码评审】商城：分销提现时，支持余额自动添加，以及微信提现到余额里
|
2024-10-13 12:37:22 +08:00 |
|
芋道源码
|
602bd5f93c
|
!1099 【新增功能】添加微信转账到零钱提现功能
Merge pull request !1099 from 痴货/jh-wxzz
|
2024-10-13 02:37:32 +00:00 |
|
YunaiV
|
fd5af249b9
|
【功能新增】商城：核销订单时，增加校验是否门店核销员的校验
|
2024-10-13 10:01:10 +08:00 |
|
YunaiV
|
6bfe628503
|
【代码优化】商城：门店自提的员工绑定
|
2024-10-13 09:47:03 +08:00 |
|
YunaiV
|
6e7db6ebd0
|
!144 【代码修复】商城订单的支付回调接口添加@PermitAll和部分DO缺少@KeySequence问题
|
2024-10-12 20:38:22 +08:00 |
|
痴货
|
1a36c5c834
|
【功能优化】增加钱包分佣提现功能
|
2024-10-08 21:26:25 +08:00 |
|
痴货
|
325d5e6b12
|
【功能优化】完成转账回调接口
|
2024-10-08 21:25:52 +08:00 |
|
痴货
|
ae1cf9e098
|
【功能优化】增加转账回调接口
|
2024-10-08 21:23:47 +08:00 |
|
痴货
|
e025b52ff4
|
微信转账未完成
|
2024-10-08 21:23:26 +08:00 |
|
痴货
|
3b9548aa2d
|
微信转账未完成
|
2024-10-08 21:23:21 +08:00 |
|
痴货
|
3e53724361
|
【功能优化】优化门店店员功能
|
2024-10-08 20:11:49 +08:00 |
|
痴货
|
476dafbb99
|
【功能】添加扫描枪核销功能、根据当前登录人查询自提点功能和绑定自提员工功能
|
2024-10-08 20:11:43 +08:00 |
|
YunaiV
|
daa1de2d19
|
【同步】jdk21 和 jdk8 的代码
|
2024-10-07 16:00:20 +08:00 |
|
YunaiV
|
e163bdf634
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.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/calculator/TradeSeckillActivityPriceCalculator.java
|
2024-10-07 15:57:56 +08:00 |
|
YunaiV
|
e6496af9ae
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-10-04 19:41:03 +08:00 |
|
YunaiV
|
2c4d8298cf
|
【代码评审】商城：纯积分兑换时，直接设置为待发货
|
2024-10-04 19:17:16 +08:00 |
|
YunaiV
|
e604cba3bf
|
【代码评审】商城：积分商城的下单流程
|
2024-10-04 18:40:33 +08:00 |
|
YunaiV
|
eaa22e7a56
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptLeaderStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptMemberStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateGroupStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidatePostStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateRoleStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserSelectStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
# yudao-server/pom.xml
|
2024-10-04 17:16:23 +08:00 |
|
puhui999
|
c74d85d940
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2024-10-04 13:59:11 +08:00 |
|
puhui999
|
67809be46d
|
【功能完善】商城: APP 完善积分商城活动下单
|
2024-10-04 13:46:20 +08:00 |
|
puhui999
|
d7236068b9
|
【功能完善】商城: APP 完善积分商城活动订单价格计算
|
2024-10-04 13:08:55 +08:00 |
|
puhui999
|
f01c600492
|
【功能完善】商城: APP 完善积分商城活动订单价格计算
|
2024-10-04 11:44:58 +08:00 |
|
puhui999
|
f72dd272a2
|
【功能完善】商城: APP 完善积分商城活动接口返回
|
2024-10-02 15:26:25 +08:00 |
|
YunaiV
|
7849666529
|
【功能修复】商城：虚拟成团时，headId 未使用团长编号
|
2024-10-02 14:58:04 +08:00 |
|
YunaiV
|
db3dbf08c6
|
【错别字修改】优惠卷 => 优惠劵
|
2024-10-01 20:44:10 +08:00 |
|
YunaiV
|
5e9bdcb21f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2024-10-01 16:11:13 +08:00 |
|
YunaiV
|
2bbb7f86fe
|
【同步】BOOT 和 CLOUD 的功能
|
2024-10-01 14:39:30 +08:00 |
|
YunaiV
|
2ca4f1fb9b
|
【功能调整】全局：默认 /app-api/* 需要登录，和 /admin-api/* 保持一致，降低大家理解成本
|
2024-10-01 11:45:00 +08:00 |
|
YunaiV
|
3d3b2cd6d5
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppProductCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/AppFavoriteController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyPageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/reward/AppRewardActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageWithdrawController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/AppCartController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/AppMemberPointRecordController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInRecordController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/channel/AppPayChannelController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
|
2024-10-01 11:33:41 +08:00 |
|
YunaiV
|
8fd0f72925
|
【功能调整】全局：默认 /app-api/* 需要登录，和 /admin-api/* 保持一致，降低大家理解成本
|
2024-10-01 11:33:18 +08:00 |
|
YunaiV
|
2299a326b5
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/DiscountActivityApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/reward/RewardActivityApiImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/DiscountActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityUpdateReqVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculator.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
|
2024-10-01 11:29:32 +08:00 |
|
YunaiV
|
9ae3682b2d
|
【功能修复】商城：秒杀活动的活动排重校验不正确的问题
|
2024-09-30 09:55:45 +08:00 |
|
YunaiV
|
caf49aae35
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
|
2024-09-30 09:04:03 +08:00 |
|
YunaiV
|
f6a6a1ff88
|
【代码评审】商城：积分商城的 review
|
2024-09-29 07:28:04 +08:00 |
|
puhui999
|
14d239f2de
|
【功能完善】商城: 完善积分商城装修
|
2024-09-28 13:44:04 +08:00 |
|
puhui999
|
dd82f13c03
|
【功能完善】商城: APP 积分商城活动完善 app-api 接口
|
2024-09-28 11:32:11 +08:00 |
|
puhui999
|
e251f2f543
|
【代码优化】商城: 完善前端返回所需字段
|
2024-09-28 10:02:14 +08:00 |
|
YunaiV
|
8850df1a09
|
【功能优化】商城：查询订单详情接口，增加 sync 主动同步支付状态
|
2024-09-24 12:44:45 +08:00 |
|
YunaiV
|
567cbeae68
|
【功能优化】商城：商城订单的支付回调，增加“已支付”情况下的防重处理
|
2024-09-24 09:45:52 +08:00 |
|
YunaiV
|
9b5d3f01ca
|
【代码评审】商城：积分商城的 review
|
2024-09-23 09:05:31 +08:00 |
|
puhui999
|
67705e7232
|
【代码优化】商城: 完善积分商城
|
2024-09-22 23:33:21 +08:00 |
|
YunaiV
|
e99a6e4ec8
|
【代码评审】商城：积分商城的 review
|
2024-09-22 16:18:00 +08:00 |
|
puhui999
|
342c25c0dd
|
【代码优化】商城: 完善积分商城
|
2024-09-21 22:28:23 +08:00 |
|
芋道源码
|
51fdbb81d4
|
!1089 【新增】商城: 积分商城 DO
Merge pull request !1089 from puhui999/develop
|
2024-09-21 07:26:58 +00:00 |
|
YunaiV
|
00f89350e6
|
【功能优化】商城：调整满减送的数据返回
|
2024-09-21 14:30:12 +08:00 |
|
puhui999
|
b531ed8486
|
【新增】商城: 积分商城 CRUD
|
2024-09-21 14:00:24 +08:00 |
|
puhui999
|
b79bbad99a
|
【新增】商城: 积分商城 DO
|
2024-09-21 12:13:06 +08:00 |
|
YunaiV
|
f9c0698e24
|
【依赖升级】netty from 4.1.111 to 4.1.113
|
2024-09-17 17:30:21 +08:00 |
|