linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,618 Commits
3 Branches
0 Tags
333 MiB
main
hhk
plp
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '9d262e8e7f'
${ noResults }
Commit Graph

4618 Commits (9d262e8e7fd8f7bc731683f9f905b4047ab9505f)
 

Author SHA1 Message Date
xiaqing 9d262e8e7f 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2 years ago
xiaqing db1f44305d 会员积分和会员签到模块todo修改 3 years ago
xiaqing 2e9dfac9ab 会员积分和会员签到模块todo修改 3 years ago
YunaiV 61fbb9909a 订单： 
1、简化交易订单的逻辑
 3 years ago
YunaiV fe07e223e4 订单： 
1、简化交易订单的逻辑
 3 years ago
YunaiV f217ba0807 售后： 
1、完善整个流程的实现
 3 years ago
YunaiV 97fc4027de Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImplTest.java
 3 years ago
YunaiV 5dd6e5bee8 营销： 
1. 售后订单，增加对 afterSaleId 的更新
 3 years ago
jason 6fbf7b261b 扫码支付统一退款单元测试， 修复退款失败，渠道错误未赋值bug 3 years ago
YunaiV d3c02f2a57 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 3 years ago
YunaiV c3de25e760 营销： 
1. 调整店铺装修接口
 3 years ago
jason 1b03fdb08b 支付宝 扫码支付 统一下单 单元测试 3 years ago
YunaiV a159a983a2 订单： 
1. 拆分读写 OrderService，避免单 Service 逻辑过重。
 3 years ago
YunaiV 159c74ce15 订单： 
1. review 发货
2. review 拼团逻辑
 3 years ago
芋道源码 60171ce7e4
!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 
Merge pull request !571 from puhui999/feature/mall_product
 3 years ago
YunaiV e4a2c738b2 订单： 
1. 增加查询物流接口
 3 years ago
puhui999 5c2723c7bf fix: 修复合并差异 3 years ago
puhui999 de828e3d04 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/BargainActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityCreateReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityUpdateReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityCreateReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityPageReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/product/BargainProductBaseVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityPageReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainActivityDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.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/CombinationServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
 3 years ago
puhui999 e2a8f7b389 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 3 years ago
puhui999 651725e3e8 fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 3 years ago
YunaiV 36da5d69b0 1、增加 App 的文件上传接口 3 years ago
YunaiV 715c42574f 订单： 
1、订单评价的接入
 3 years ago
YunaiV 7dc398717a 订单： 
1、实现确认收货接口
 3 years ago
YunaiV 503c996acd 订单： 
1、移除 deliverStatus 发货状态，暂时没作用
2、无需发货时，使用 logisticsId 进行实现
3、订单详情，增加 logisticsId 和 logisticsName 返回
 3 years ago
YunaiV e159b2e500 code review：砍价的代码 3 years ago
YunaiV ba31d5f6fb 优化拼团活动的管理后台代码 3 years ago
YunaiV 6fdd4da0b3 优化秒杀活动的管理后台代码 3 years ago
YunaiV be2ee905df code review：积分模块的实现 3 years ago
芋道源码 4177071758
!560 todo修改 
Merge pull request !560 from QingX/feature/mall_product
 3 years ago
YunaiV 5fcd0a21da Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
YunaiV ee53d2ad51 修复租户套餐修改时，查询角色报错问题 3 years ago
YunaiV 9ff67b479f !562 优化 redisCache 3 years ago
芋道源码 8960a82978
!562 优化 redisCache 
Merge pull request !562 from wanwan/feature/redis_cache_optimize_20230810
 3 years ago
YunaiV b5515799dc !557 修改创建菜单时permission为空，缓存KEY 为空的BUG 3 years ago
YunaiV b53bfb0976 Merge branch 'feature/deps' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 3 years ago
芋道源码 aadf2778fe
!556 修复表格固定列不设置宽度时布局错误问题 
Merge pull request !556 from BladeX/master
 3 years ago
芋道源码 815755fa3a
!557 修改创建菜单时permission为空，缓存KEY 为空的BUG 
Merge pull request !557 from 杜继强/master
 3 years ago
芋道源码 a97e06b460
!558 支付模块微信App统一下单返回值解析错误 
Merge pull request !558 from 马铃薯头/master
 3 years ago
芋道源码 1130434b02
!559 update yudao-ui-admin/src/views/infra/fileConfig/index.vue. 
Merge pull request !559 from 账号已删除/N/A
 3 years ago
芋道源码 4d0873374f
!561 fix:修复新建租户时由于data_scope_dept_ids为空值，产生的错误导致插入不成功。 
Merge pull request !561 from 天天写BUG/master
 3 years ago
YunaiV 27b8202053 微调支付收银界面，缺少 success 参数 3 years ago
wanwan 134e5ca20f feat: 将 redisCache 的扫描策略设置成 scan 3 years ago
wanwan 64c8dd6292 feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位 3 years ago
wanwan c4a7da9233 Revert "feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位" 
This reverts commit 47698bfc6c.
 3 years ago
wanwan e1fe21f24c Revert "feat: 将 redisCache 的扫描策略设置成 scan" 
This reverts commit 72d2dcc68f.
 3 years ago
jlc@yoc.tech 47698bfc6c feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位 3 years ago
jlc@yoc.tech 72d2dcc68f feat: 将 redisCache 的扫描策略设置成 scan 3 years ago
天天写BUG f221f58973
update sql/postgresql/ruoyi-vue-pro.sql. 
fix:修复创建新租户，由于data_scope_dept_ids设置的是 not null 但是是空值时候产生错误，插入失败

Signed-off-by: 天天写BUG <decan_zheng@foxmail.com>
 3 years ago
xiaqing 93effe8fa7 新版表结构 3 years ago
xiaqing d397758dd1 还原配置文件 3 years ago