pikachu
|
0a17fa9f53
|
修复会员总获得积分api
|
2021-08-10 19:21:11 +08:00 |
|
Chopper
|
829472c6a3
|
Merge remote-tracking branch 'origin/qiuqiu'
合并砍价/积分相关
# Conflicts:
# consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
# update-sql/version4.2to4.3.sql
|
2021-07-30 15:50:36 +08:00 |
|
Chopper
|
0760c72ef8
|
热词获取改为根据数量，传递count获取系统热搜词语
|
2021-07-30 14:27:41 +08:00 |
|
Chopper
|
f00386c81d
|
继续优化代码，调整依赖关系，缩减无效代码
|
2021-07-28 11:19:33 +08:00 |
|
lifenlong
|
02f3bde2b4
|
积分订单、用户下单积分数值判断
|
2021-07-27 15:33:11 +08:00 |
|
lifenlong
|
5a7440c5bf
|
同步master，解决冲突
|
2021-07-27 10:00:34 +08:00 |
|
Chopper
|
58d41775cf
|
店铺请求不记录PV统计
|
2021-07-22 17:26:10 +08:00 |
|
Chopper
|
fdb55bc426
|
Merge branch 'backup'
# Conflicts:
# framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
# framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
# framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
# framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
|
2021-07-22 12:07:22 +08:00 |
|
Chopper
|
0ccdc94644
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-07-21 17:46:58 +08:00 |
|
Chopper
|
bd3aceaeac
|
完善方法注释
|
2021-07-21 17:46:46 +08:00 |
|
Chopper
|
bc6abdbf1a
|
初步调整结构完成
|
2021-07-21 15:23:47 +08:00 |
|
lifenlong
|
44fb0601a6
|
解决商品购买但是商品页面的库存显示不正确的问题
|
2021-07-20 20:25:57 +08:00 |
|
lifenlong
|
6607506929
|
砍价订单实现
|
2021-07-20 16:18:54 +08:00 |
|
Chopper
|
fe021f8a11
|
暂时备份一下代码，准备切换master
|
2021-07-20 15:44:09 +08:00 |
|
Chopper
|
4b7ab94ba4
|
批量调整目录结构
|
2021-07-19 16:07:02 +08:00 |
|
Chopper
|
06212c073d
|
调整目录结构
|
2021-07-19 15:01:51 +08:00 |
|
lifenlong
|
451d683c4f
|
Merge branch 'master' into qiuqiu
|
2021-07-18 13:43:45 +08:00 |
|
lifenlong
|
5d211c241d
|
砍价活动商品购买
|
2021-07-17 14:02:34 +08:00 |
|
Chopper
|
a9c79eedd4
|
代码结构优化，缩减。一个多次判定问题处理
|
2021-07-16 10:40:44 +08:00 |
|
lifenlong
|
4718ce292d
|
修改砍价活动
|
2021-07-13 16:17:53 +08:00 |
|
pikachu
|
656e2a9307
|
合并
|
2021-07-12 23:41:23 +08:00 |
|
pikachu
|
7f08124afc
|
砍价活动第一版本
|
2021-07-12 23:38:32 +08:00 |
|
Chopper
|
86f010b87e
|
maven 规范
|
2021-07-12 16:33:32 +08:00 |
|
Chopper
|
d29d166ce0
|
banner 统一
|
2021-07-12 14:44:11 +08:00 |
|
lifenlong
|
18d2379a19
|
采用阿里代码规约，对代码进行优化
|
2021-07-09 08:42:16 +08:00 |
|
lifenlong
|
3e73257922
|
采用阿里代码规约，对代码进行优化
|
2021-07-09 01:56:24 +08:00 |
|
lifenlong
|
931276f72b
|
添加ResultCode
|
2021-07-01 11:17:18 +08:00 |
|
lifenlong
|
cce14b4794
|
同步
|
2021-07-01 08:35:18 +08:00 |
|
Chopper
|
079437100d
|
版本好升级
|
2021-06-30 19:59:36 +08:00 |
|
lifenlong
|
346465630c
|
添加ResultCode
|
2021-06-30 15:45:33 +08:00 |
|
Chopper
|
23388eff6b
|
升级项目版本号
|
2021-06-30 14:53:26 +08:00 |
|
lifenlong
|
800437473d
|
1.分销员添加结算银行信息
2.电话校验支持手机号
|
2021-06-30 12:02:35 +08:00 |
|
lifenlong
|
a60a535708
|
修改分销可提现金额
|
2021-06-30 08:41:04 +08:00 |
|
pikachu
|
8ed54e061f
|
会员消息修改
|
2021-06-29 08:25:54 +08:00 |
|
pikachu
|
5786cb9e55
|
修改商品参数校验以及充值回调接口
|
2021-06-26 16:48:06 +08:00 |
|
Chopper
|
0d6d92139b
|
余额支付错误的判定问题处理
|
2021-06-25 16:00:23 +08:00 |
|
Chopper
|
54320499e5
|
错误消息完善
|
2021-06-25 10:17:58 +08:00 |
|
Chopper
|
7851e8af39
|
规格代码相关改版
|
2021-06-23 16:46:52 +08:00 |
|
OceansDeep
|
6419d5b7e8
|
!9 修复更新商品状态不会更新缓存商品数据问题
Merge pull request !9 from OceansDeep/feature/pg
|
2021-06-22 14:43:53 +00:00 |
|
paulGao
|
bf67a45d53
|
Merge branch 'feature/pg' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2021-06-22 22:34:02 +08:00 |
|
paulGao
|
12238d3989
|
修复更新商品状态不会更新缓存商品数据问题
|
2021-06-22 22:33:10 +08:00 |
|
Chopper
|
3e237a8488
|
商品创建订单，提示语问题处理
|
2021-06-22 15:21:02 +08:00 |
|
chopper711
|
eb1b6fac5c
|
!7 会员站内信功能相关合并
Merge pull request !7 from chopper711/qiuqiu
|
2021-06-21 14:16:44 +08:00 |
|
Chopper
|
c7e4af6175
|
注释规范
|
2021-06-21 14:14:07 +08:00 |
|
paulGao
|
337775013e
|
修复拼团商品限购数量问题，添加创建订单流程过后清除缓存key
|
2021-06-21 14:02:31 +08:00 |
|
lifenlong
|
bfc76f7ceb
|
同步master
|
2021-06-18 10:03:34 +08:00 |
|
pikachu
|
0cfb196918
|
Merge branch 'master' into qiuqiu
|
2021-06-18 07:55:53 +08:00 |
|
pikachu
|
975550374a
|
新增会员站内信消息
|
2021-06-18 07:55:25 +08:00 |
|
Chopper
|
7ce5b517fc
|
商品评价场景，查询业务重构，代码复用增强，前端可以查看到后端设置隐藏的评价内容问题解决
|
2021-06-17 10:37:11 +08:00 |
|
Chopper
|
a97b698d8e
|
Merge branch 'master' into Bulbasaur
# Conflicts:
# consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
# consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java
# framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
# framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
# framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
|
2021-06-15 15:50:54 +08:00 |
|