20 Commits

Author SHA1 Message Date
lifenlong
c10b698aed 支持文章传图 2021-07-03 13:40:18 +08:00
lifenlong
931276f72b 添加ResultCode 2021-07-01 11:17:18 +08:00
Chopper
02d23dc217 1、主要解决商品参数后端存储格式问题,结构问题等
2、配送商品超出配送区域提出警告,但是依然可以下单问题处理
2021-06-25 09:46:38 +08:00
paulGao
41a86ff7dc 修复商品索引参数问题 2021-06-22 00:07:33 +08:00
lifenlong
bfc76f7ceb 同步master 2021-06-18 10:03:34 +08:00
paulGao
c69cd0c22d 修复拼团商品下单问题和添加商品是否需要索引 2021-06-17 09:11:16 +08:00
lifenlong
fbcd5b7470 app版本修改,过滤当前版本 2021-06-17 00:28:36 +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
Chopper
9195292aa9 演示站点部分权限控制 2021-06-10 17:40:53 +08:00
lifenlong
a51e86fd98 去除e.printStackTrace();使用slf4j实现 2021-06-07 16:49:59 +08:00
lifenlong
0324951d9a 微信小程序优化 2021-06-01 15:51:19 +08:00
lifenlong
814d118d77 运营后台可设置推荐直播间 2021-05-28 12:10:33 +08:00
lifenlong
120189ef99 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-05-19 19:13:53 +08:00
lifenlong
64c095f20e 分销订单 2021-05-19 19:11:57 +08:00
Chopper
a10110e1f0 调整异常机制 2021-05-19 14:11:12 +08:00
Chopper
0528a1e1ca 错误消息机制问题重新处理 2021-05-18 15:40:26 +08:00
lifenlong
90d03a05a2 增加店铺入驻文章类型。添加修改文章状态方法 2021-05-18 08:57:43 +08:00
Chopper
4cea9038eb 增加注释 2021-05-17 10:42:06 +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