weigang
|
09d29b0985
|
Merge branch 'order'
# Conflicts:
# app/Service/CouponRebateService.php
# app/Service/CouponRebateServiceInterface.php
# config/autoload/dependencies.php
|
5 years ago |
|
weigang
|
ac4ff48e17
|
优惠券返券
|
5 years ago |
|
weigang
|
f0293b871f
|
Merge branch 'order'
|
5 years ago |
|
weigang
|
de784c32c3
|
Fix cash
|
5 years ago |
|
weigang
|
b3d1b14c56
|
Fix middle
|
5 years ago |
|
weigang
|
8383851698
|
Merge branch 'order'
|
5 years ago |
|
weigang
|
afc653445a
|
F
|
5 years ago |
|
weigang
|
37e87318aa
|
Merge branch 'order'
|
5 years ago |
|
weigang
|
d07a2eaf30
|
Fixbug
|
5 years ago |
|
weigang
|
4c7459f6e5
|
Merge branch 'order'
|
5 years ago |
|
weigang
|
4f07a7424d
|
日志
|
5 years ago |
|
weigang
|
c7e02cfb99
|
Merge branch 'order'
|
5 years ago |
|
weigang
|
c65e432ec7
|
日志
|
5 years ago |
|
weigang
|
1f279e2a01
|
Merge branch 'order'
|
5 years ago |
|
weigang
|
6179e6e001
|
打个日志
|
5 years ago |
|
weigang
|
fa32ddb292
|
Merge branch 'order'
# Conflicts:
# app/Commons/Log.php
# app/Constants/ErrorCode.php
# app/Constants/LogLabel.php
# app/Controller/AbstractController.php
# app/Controller/TestController.php
# app/Model/OrderMain.php
# app/Service/CouponService.php
# app/Service/CouponServiceInterface.php
# app/Service/UserService.php
# app/Service/UserServiceInterface.php
# composer.json
# config/autoload/dependencies.php
# config/autoload/exceptions.php
# config/autoload/middlewares.php
# config/routes.php
|
5 years ago |
|
weigang
|
f5ad8df2d8
|
奖励
|
5 years ago |
|
weigang
|
0785999db0
|
商户奖励（平台新用户BUG）
|
5 years ago |
|
weigang
|
378a14b048
|
奖励
|
5 years ago |
|
weigang
|
69316fac90
|
修复奖励
|
5 years ago |
|
weigang
|
f9b0fce54f
|
新增依赖
|
5 years ago |
|
weigang
|
7d831289ac
|
优惠券使用
|
5 years ago |
|
weigang
|
38d7035b88
|
修复跨店下单商品问题
|
5 years ago |
liangyuyan
|
1210e96c38
|
优惠券返券活动--修改背景图
|
5 years ago |
|
weigang
|
2e22315ea2
|
banner排序
|
5 years ago |
|
weigang
|
5e3d155771
|
Merge branch 'coupon_rebate' hot_fix_4
|
5 years ago |
 Lemon
|
02723b0ee0
|
Merge branch 'coupon_rebate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into coupon_rebate
# Conflicts:
# app/Amqp/Consumer/couponRebateConsumer.php
# app/Service/CouponService.php
|
5 years ago |
|
weigang
|
2651fe4fb7
|
hot_fix_3
|
5 years ago |
|
weigang
|
d9bc4c7d46
|
hot_fix_2
|
5 years ago |
|
liangyuyan
|
11e2bf44cd
|
优惠券返券活动--修改amqp
|
5 years ago |
|
weigang
|
08648047bd
|
hot_fix
|
5 years ago |
|
weigang
|
4daa303f53
|
优惠券使用
|
5 years ago |
|
weigang
|
6b7e98a92d
|
Merge branch 'coupon_rebate'
# Conflicts:
# .gitignore
# Envoy.blade.php
# app/Constants/ErrorCode.php
# app/Controller/CouponController.php
# app/Listener/ValidatorFactoryResolvedListener.php
# app/Service/UserService.php
# app/Service/UserServiceInterface.php
# composer.json
# config/autoload/dependencies.php
# config/autoload/exceptions.php
# config/autoload/middlewares.php
# config/autoload/server.php
# config/routes.php
|
5 years ago |
|
liangyuyan
|
0e3687e697
|
更新用户unionid
|
5 years ago |
|
weigang
|
8145b74169
|
去掉Debug
|
5 years ago |
|
weigang
|
24df57265e
|
Debug
(cherry picked from commit b789d72128)
|
5 years ago |
|
liangyuyan
|
4da66fe1f9
|
优惠券返券活动--修改图片为正式oos的路径
|
5 years ago |
|
weigang
|
8133c86dc5
|
debug mqttclient
|
5 years ago |
|
weigang
|
058afbe306
|
将MQTTClient移出task
|
5 years ago |
|
weigang
|
e686bb6db3
|
去掉调试代码
|
5 years ago |
|
weigang
|
0dd1daed41
|
当面付下单
|
5 years ago |
|
weigang
|
a52e052c83
|
当面付支付通知
|
5 years ago |
|
weigang
|
1115719242
|
Merge branch 'order' of ssh://120.24.33.109:11022/hyzjshwo/lanzu_api_hyperf into order
|
5 years ago |
|
weigang
|
e952ee31ea
|
当面付支付通知
|
5 years ago |
|
Lemon
|
6abb9f9081
|
合计金额换行问题
|
5 years ago |
|
weigang
|
28861f0494
|
去除下单调试代码
|
5 years ago |
|
weigang
|
9820a42aff
|
喇叭播报调整
|
5 years ago |
|
weigang
|
2d8ed3c41b
|
Fx
|
5 years ago |
|
weigang
|
4417db8739
|
f
|
5 years ago |
|
weigang
|
49383d9ab5
|
F
|
5 years ago |
