weigang
|
9b0dfc5d3f
|
Merge branch '0927-selftake-new' into master
# Conflicts:
# app/Controller/v3/OrderOnlineController.php
|
5 years ago |
|
weigang
|
42a00a3df1
|
Merge branch '0927-orderstatistics' into master
|
5 years ago |
|
weigang
|
c24fc5c8a0
|
Merge branch '0927-hotfix-store-close-financial' into master
|
5 years ago |
|
weigang
|
79468ad9fe
|
Merge branch '0927-deal-redis' into master
# Conflicts:
# app/Service/v3/Implementations/GoodsService.php
|
5 years ago |
|
weigang
|
177ba570b3
|
Merge branch '0927-community-bind' into master
|
5 years ago |
 Lemon
|
6ccc7f1839
|
Merge branch 'appointment_time_fix'
|
5 years ago |
|
Lemon
|
359a2c8b18
|
Merge branch 'goods_supervise'
# Conflicts:
# app/Service/v3/Implementations/GoodsService.php
|
5 years ago |
|
Lemon
|
ef1ddea707
|
Merge branch 'print_fix'
|
5 years ago |
|
Lemon
|
1ffbad3e62
|
商品管理
|
5 years ago |
|
weigang
|
bb4ead3b49
|
SSDB异常捕获
|
6 years ago |
|
Lemon
|
8be407f374
|
商品上下架
|
6 years ago |
|
Lemon
|
63ee1262fc
|
日志
|
6 years ago |
|
Lemon
|
20279ee44c
|
日志
|
6 years ago |
|
Lemon
|
ba825611b9
|
单位原价 日志
|
6 years ago |
|
weigang
|
c60d5b095d
|
当面付订单统计
|
6 years ago |
|
weigang
|
c2fef05c08
|
当面付
|
6 years ago |
|
weigang
|
10d6a066f0
|
店铺关店时无法收到支付流水的问题
|
6 years ago |
|
Lemon
|
14b48b7354
|
错误信息
|
6 years ago |
|
Lemon
|
49422f82e3
|
营业时间冲突
|
6 years ago |
|
weigang
|
b041fd0c71
|
统计订单数算上用优惠券的订单（因优惠券退款时是按比例退的，商户会有剩余优惠券的金额在）
|
6 years ago |
|
weigang
|
410afad105
|
优惠券
|
6 years ago |
|
weigang
|
447f1fb744
|
Merge branch 'master' into 0927-selftake-new
|
6 years ago |
|
weigang
|
6c4622536f
|
RPC订单状态
|
6 years ago |
|
weigang
|
e5b2021964
|
直接退款的状态新增一个，然后还要重新统计和订单列表
|
6 years ago |
|
Lemon
|
37e39fa2d8
|
自提
|
6 years ago |
|
Lemon
|
fe6dc2c1d6
|
送达时间
|
6 years ago |
|
weigang
|
2186865052
|
统计修复去重
|
6 years ago |
|
weigang
|
8c6fbd939c
|
统计
|
6 years ago |
|
weigang
|
ed97ca9db7
|
no message
|
6 years ago |
|
weigang
|
f4459464a2
|
商户中心统计
|
6 years ago |
|
weigang
|
05aa69d427
|
新增社区返回source_id
|
6 years ago |
|
Lemon
|
f735d676e0
|
用户自提
|
6 years ago |
|
Lemon
|
9e718d4573
|
模型增加三级分类批量添加
|
6 years ago |
|
weigang
|
4e3ddf910c
|
新自提优化
|
6 years ago |
|
weigang
|
e55bcc86b2
|
fix
|
6 years ago |
|
weigang
|
5e0b2991b3
|
冻结和释放库存
|
6 years ago |
|
Lemon
|
33813d497f
|
打印 配送费
|
6 years ago |
|
weigang
|
ba5b1f0cf6
|
用户和商户订单红点角标badge
|
6 years ago |
|
Lemon
|
8a67a6869e
|
修复更新商品 对下架商品无效问题
|
6 years ago |
|
Lemon
|
f807d3da63
|
验证器
|
6 years ago |
|
Lemon
|
69c0dd2e2f
|
二级分类
|
6 years ago |
|
Lemon
|
818a8495d9
|
获取商品标签
|
6 years ago |
|
Lemon
|
ac9cdea7c9
|
商家中心 余额明细
|
6 years ago |
|
weigang
|
777c52f35c
|
Merge branch 'hotfix-0924' into master
|
6 years ago |
|
weigang
|
283f7f62a7
|
Merge branch 'hotfix-0925-order' into master
|
6 years ago |
|
weigang
|
298b63a707
|
退款特价商品记录处理
|
6 years ago |
|
weigang
|
fd77452d9a
|
特价商品处理
|
6 years ago |
|
Lemon
|
7c24f710b1
|
三级分类
|
6 years ago |
|
Lemon
|
ccb01b3308
|
新建商品
|
6 years ago |
|
Lemon
|
1297617ecf
|
配送费
|
6 years ago |
