26 Commits

Author SHA1 Message Date
paulGao
d3e1de5620 fix XSS and BAC, improve code style 2021-09-09 16:47:14 +08:00
lifenlong
7aa99497e5 添加导出结算单功能 2021-08-13 18:16:13 +08:00
Chopper
9e3eb1f74e 订单申诉完成是,无需进行撤销申诉操作 2021-08-12 00:28:46 +08:00
lifenlong
abdc74c773 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-07-23 19:45:21 +08:00
lifenlong
2c8ac59628 优化商品显示逻辑
售后价格判断
2021-07-23 19:44:46 +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
4b7ab94ba4 批量调整目录结构 2021-07-19 16:07:02 +08:00
lifenlong
63802a596b 添加秒杀设置 2021-06-28 11:30:37 +08:00
lifenlong
bfc76f7ceb 同步master 2021-06-18 10:03:34 +08:00
Chopper
7ce5b517fc 商品评价场景,查询业务重构,代码复用增强,前端可以查看到后端设置隐藏的评价内容问题解决 2021-06-17 10:37:11 +08:00
lifenlong
a159c0d0db 下载批量发货订单列表 2021-06-13 15:53:19 +08:00
lifenlong
3814b4a9a5 暂提 2021-06-13 14:51:39 +08:00
lifenlong
5a4f8e2a72 同步 2021-06-13 09:03:16 +08:00
lifenlong
34e5488b9d 创建虚拟订单
由前台处理待发货订单导出
2021-06-10 16:25:40 +08:00
lifenlong
a51e86fd98 去除e.printStackTrace();使用slf4j实现 2021-06-07 16:49:59 +08:00
lifenlong
e379a2eb34 导出售后单 2021-06-05 14:48:16 +08:00
lifenlong
b7e439e177 店铺导出订单列表 2021-06-05 14:04:56 +08:00
lifenlong
0324951d9a 微信小程序优化 2021-06-01 15:51:19 +08:00
lifenlong
3639ed731b 虚拟订单核验 2021-05-29 12:31:38 +08:00
lifenlong
99b9e8cf91 导出订单发货Excel,上传Excel订单批量发货 2021-05-26 17:09:55 +08:00
Chopper
a10110e1f0 调整异常机制 2021-05-19 14:11:12 +08:00
Chopper
0528a1e1ca 错误消息机制问题重新处理 2021-05-18 15:40:26 +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