Chopper
|
6184ba9b82
|
店铺流水相关代码优化，流水与结算单业务隔离。
相关方法进行优化，迁移。
|
2021-11-30 16:57:19 +08:00 |
|
Chopper
|
58648c3ece
|
模块隔离优化
|
2021-11-24 10:30:21 +08:00 |
|
Chopper
|
dbd35c18b5
|
微信支付签名被xss过滤问题处理忽略
|
2021-11-22 18:20:06 +08:00 |
|
paulGao
|
89420f5c1e
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
# Conflicts:
# buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
|
2021-11-11 18:18:00 +08:00 |
|
paulGao
|
6f13218564
|
修复安全漏洞。优化代码
|
2021-11-11 18:15:21 +08:00 |
|
Chopper
|
0ff0f266d4
|
会员收货地址管理类位置规范
|
2021-11-09 15:17:26 +08:00 |
|
Chopper
|
a210565387
|
增加脱敏配置。
lili:
system:
sensitiveLevel: 2
|
2021-09-13 10:30:56 +08:00 |
|
paulGao
|
d3e1de5620
|
fix XSS and BAC, improve code style
|
2021-09-09 16:47:14 +08:00 |
|
Chopper
|
e08e187526
|
去除无效类，版本号切换，准备打版
|
2021-08-30 16:58:47 +08:00 |
|
Chopper
|
fe8523ca3f
|
Merge branch 'backup'
# Conflicts:
# manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
# manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
# manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
# manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
# manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
# manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
|
2021-07-25 17:51:05 +08:00 |
|
lifenlong
|
1ee60c02d3
|
添加引用
|
2021-07-23 19:58:32 +08:00 |
|
Chopper
|
280c5dec39
|
注解包调整
|
2021-07-22 17:33:57 +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
|
bd3aceaeac
|
完善方法注释
|
2021-07-21 17:46:46 +08:00 |
|
Chopper
|
fe021f8a11
|
暂时备份一下代码，准备切换master
|
2021-07-20 15:44:09 +08:00 |
|
Chopper
|
a9c79eedd4
|
代码结构优化，缩减。一个多次判定问题处理
|
2021-07-16 10:40:44 +08:00 |
|
lifenlong
|
18d2379a19
|
采用阿里代码规约，对代码进行优化
|
2021-07-09 08:42:16 +08:00 |
|
Chopper
|
d96d5edcd5
|
会员提现api注解问题处理
|
2021-06-29 10:13:18 +08:00 |
|
chopper711
|
eb1b6fac5c
|
!7 会员站内信功能相关合并
Merge pull request !7 from chopper711/qiuqiu
|
2021-06-21 14:16:44 +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 |
|
lifenlong
|
332e287675
|
修改虚拟订单类型
|
2021-06-10 20:13:21 +08:00 |
|
Chopper
|
9195292aa9
|
演示站点部分权限控制
|
2021-06-10 17:40:53 +08:00 |
|
lifenlong
|
bbe01e9e67
|
用户经验值设置
|
2021-06-05 17:13:04 +08:00 |
|
lifenlong
|
273d0abbc7
|
解决冲突
|
2021-05-19 19:38:17 +08:00 |
|
lifenlong
|
250fffab77
|
merge master
|
2021-05-19 19:29:51 +08:00 |
|
Chopper
|
97defc8a12
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
# Conflicts:
# manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java
|
2021-05-19 16:36:35 +08:00 |
|
Chopper
|
a10110e1f0
|
调整异常机制
|
2021-05-19 14:11:12 +08:00 |
|
lifenlong
|
8d156f01e6
|
会员积分历史
|
2021-05-19 09:07:56 +08:00 |
|
lifenlong
|
37a6455e56
|
会员积分历史
|
2021-05-19 09:05:44 +08:00 |
|
lifenlong
|
02827a2f8b
|
微信小程序直播V0.2
|
2021-05-18 23:34:05 +08:00 |
|
lifenlong
|
0173ba814e
|
Merge branch 'master' into Bulbasaur
|
2021-05-18 17:35:48 +08:00 |
|
Chopper
|
0528a1e1ca
|
错误消息机制问题重新处理
|
2021-05-18 15:40:26 +08:00 |
|
lifenlong
|
57d65f3fd9
|
会员等级V0.1
|
2021-05-16 23:41:33 +08:00 |
|
lifenlong
|
a10c38f3c1
|
去除final使用@Autowired
|
2021-05-13 15:07:03 +08:00 |
|
Chopper
|
3785bdb3bb
|
commit message
|
2021-05-13 10:41:46 +08:00 |
|