weigang
|
22ef7439dd
|
Merge branch 'speaker' into order
合并speaker进当前分支
# Conflicts:
# app/Model/Order.php
# app/Model/OrderMain.php
# composer.json
# config/autoload/dependencies.php
# config/routes.php
|
5 years ago |
|
weigang
|
5ef2076b74
|
外卖订单下单
|
5 years ago |
liangyuyan
|
1ad034cc2c
|
优惠券返券活动--请求参数ids为空处理
|
5 years ago |
 DESKTOP-GG6FIN9\Administrator
|
7f51e5f0cf
|
新增用户校验
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
09bfbf4ab7
|
Merge branch 'coupon_rebate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into coupon_rebate
|
5 years ago |
|
liangyuyan
|
c0ac902090
|
优惠券返券活动--添加活动过期提示
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
55beb100ae
|
获取用户已领取优惠券列表
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
207ac3ced0
|
返券
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
68215280bd
|
已领取优惠券列表
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
da9df22b7d
|
已领取红包列表
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
bb193b9d46
|
已领取优惠券列表
|
5 years ago |
|
liangyuyan
|
dbb96dad6b
|
优惠券返券活动--修改获取接口
|
5 years ago |
|
liangyuyan
|
33ad505c93
|
优惠券返券活动--修改背景图
|
5 years ago |
|
liangyuyan
|
6d4c4d3240
|
优惠券返活动--修改分享背景图
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
0a869a507d
|
Merge branch 'coupon_rebate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into coupon_rebate
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
4e26801b4d
|
返券合并
|
5 years ago |
|
liangyuyan
|
494e677974
|
Merge branch 'coupon_rebate' of ssh://120.24.33.109:11022/hyzjshwo/lanzu_api_hyperf into coupon_rebate
|
5 years ago |
|
liangyuyan
|
7e51571ec3
|
优惠券返券活动--修改领取优惠券存ssdb的格式
|
5 years ago |
|
weigang
|
b1156b71a3
|
Token name自定义
|
5 years ago |
|
weigang
|
605ace63c9
|
fix
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
72178dea35
|
返券库存
|
5 years ago |
|
weigang
|
e7caeaf4bd
|
用户社区绑定
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
cd45fe61c3
|
返券
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
8d2ca49c83
|
返券
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
866fcf15f4
|
返券
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
d4fb2d20c4
|
修改amqp配置
|
5 years ago |
|
liangyuyan
|
5febaa87c2
|
优惠券返券活动--修改分享背景图
|
5 years ago |
Mike
|
8e01b4e319
|
修改log host地址
|
5 years ago |
|
liangyuyan
|
7a8803643b
|
优惠券返券活动--修改获取优惠券分享背景图片时的图片域名
|
5 years ago |
|
liangyuyan
|
1272da173d
|
优惠券返券活动--优惠券接口（getSystemCouponUserList）添加返回背景图
|
5 years ago |
|
weigang
|
d93fbd78a2
|
社区扫码绑定接口
|
5 years ago |
|
liangyuyan
|
e043558427
|
优惠券返券活动--减库存（加领取量）
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
907bc49551
|
队列
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
73fc7fa73d
|
返券
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
6eb8019119
|
返券 测试版
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
53d665cb18
|
Merge branch 'coupon_rebate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into coupon_rebate
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
0dbf1b1b17
|
返券 测试版
|
5 years ago |
|
liangyuyan
|
9a16422fd4
|
Merge branch 'coupon_rebate' of ssh://120.24.33.109:11022/hyzjshwo/lanzu_api_hyperf into coupon_rebate
|
5 years ago |
|
liangyuyan
|
e695f5553d
|
优惠券返券--添加清除领取记录接口
|
5 years ago |
|
weigang
|
b0e417ff34
|
是否平台新用户
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
8d437ab29c
|
Merge branch 'coupon_rebate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into coupon_rebate
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
7d989e3d6f
|
返券
|
5 years ago |
|
weigang
|
e3b323d2a7
|
SSDB Task修改
(cherry picked from commit e5ead24208)
|
5 years ago |
|
liangyuyan
|
8d1582cfd5
|
优惠券返券--修改领取接口-ssdb记录全领取的优惠券
|
5 years ago |
|
liangyuyan
|
5961de7d49
|
优惠券返券红包--领取优惠券接口修改，之前将保存代码注释调试，现在去掉注释
|
5 years ago |
|
liangyuyan
|
1a177615b9
|
优惠券返券活动--修改获取活动标志acrtivity_type为通过ssdb获取
|
5 years ago |
|
liangyuyan
|
343a4be0b9
|
优惠券返券活动--优化用户领取优惠券接口
|
5 years ago |
|
weigang
|
d583c82bcd
|
app_env设置为local时不进行api auth
(cherry picked from commit 371ecf76c8)
|
5 years ago |
|
liangyuyan
|
7fdba93322
|
优惠券返券活动--记录活动活动标识值activity_type到ssdb
|
5 years ago |
|
liangyuyan
|
3d764144c2
|
优惠券返券活动--修改获取优惠券接口getSystemCouponUserList
|
5 years ago |
