Commits · 97133da74e117e1ea75b85343d0e8c5af4a35209 · huluobin / gogirl-miniapp-backend

20 Apr, 2020 2 commits

Merge branch 'master' into branch · 97133da7

# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/PayServiceImpl.java
#	src/main/java/com/gogirl/interfaces/market/coupon/CouponController.java

authored Apr 20, 2020

97133da7

bug fix prod · f535c970
huluobin authored Apr 20, 2020

f535c970

17 Apr, 2020 5 commits
- 充值订单卡券订单 · ba15d5e5
  huluobin authored Apr 17, 2020
  
  ba15d5e5
- dto层清理 · 8e72efaa
  huluobin authored Apr 17, 2020
  
  8e72efaa
- 自动选券 · 0ff9d4c5
  huluobin authored Apr 17, 2020
  
  0ff9d4c5
- Merge branch 'master' into branch · b867d7a2
```
# Conflicts:
#	src/main/resources/application-dev.yml
```
  huluobin authored Apr 17, 2020
  b867d7a2
- 订单评价页面查询兜底处理 · 3feea5a8
  huluobin authored Apr 17, 2020
  
  3feea5a8
15 Apr, 2020 5 commits
- 普通会员同步 · 0c58496c
  huluobin authored Apr 15, 2020
  
  0c58496c
- Merge branch 'master' into branch · 77675798
  huluobin authored Apr 15, 2020
  
  77675798
- 我的卡券 · 28d9d5bf
  huluobin authored Apr 15, 2020
  
  28d9d5bf
- fix · b0236fe0
  huluobin authored Apr 15, 2020
  
  b0236fe0
- 美甲师添加推荐人 · 4de67a38
  huluobin authored Apr 15, 2020
  
  4de67a38
14 Apr, 2020 26 commits
- coupon fix · 56ee7c86
  huluobin authored Apr 14, 2020
  
  56ee7c86
- coupon_fix · d0a633ac
  huluobin authored Apr 14, 2020
  
  d0a633ac
- Merge branch 'fix_coupon2' into branch · 8425031a
  huluobin authored Apr 14, 2020
  
  8425031a
- update · f32f7c42
  huluobin authored Apr 14, 2020
  
  f32f7c42
- update · 8234bd35
  huluobin authored Apr 14, 2020
  
  8234bd35
- Merge branch 'fix_coupon2' into branch · a729a09e
```
# Conflicts:
#	src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java
```
  huluobin authored Apr 14, 2020
  a729a09e
- 内部券使用 · 71c4f12d
  huluobin authored Apr 14, 2020
  
  71c4f12d
- Merge branch 'branch' into fix_coupon · 39098d3b
  huluobin authored Apr 14, 2020
  
  39098d3b
- 普通内部券 · fa58fb0e
  huluobin authored Apr 14, 2020
  
  fa58fb0e
- 折扣券注释 · 577dee1d
  huluobin authored Apr 14, 2020
  
  577dee1d
- 折扣券 · 6f2125d2
  huluobin authored Apr 14, 2020
  
  6f2125d2
- 已删除过滤 · f13fcab9
  huluobin authored Apr 14, 2020
  
  f13fcab9
- 自动选券 · f14cd636
  huluobin authored Apr 14, 2020
  
  f14cd636
- 睫毛卸除、卸甲、延长，跳色（辅助服务）与主服务一起时，不需要单独开单，主服务开单即可。店员端若要修改主服务的话，系统将辅助服务一并清空，美甲师选服务的时候跟用户端一样，弹出是否需要辅助服务 · f15e4cd2
  huluobin authored Apr 14, 2020
  
  f15e4cd2
- update · 56850520
  huluobin authored Apr 14, 2020
  
  56850520
- Merge branch 'technician_push' into branch · a16ecffb
```
# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
#	src/main/java/com/gogirl/infrastructure/service/push/impl/TechnicianPushServiceImpl.java
```
  huluobin authored Apr 14, 2020
  a16ecffb
- 企业微信消息 · 185598ad
  huluobin authored Apr 14, 2020
  
  185598ad
- 企业微信推送Fix bug · 1b0778b0
  huluobin authored Apr 14, 2020
  
  1b0778b0
- 企业微信推送Fix bug · ae621e21
  huluobin authored Apr 14, 2020
  
  ae621e21
- 企业微信推送Fix bug · 41b557b8
  huluobin authored Apr 14, 2020
  
  41b557b8
- 企业微信消息 · 70d34f96
  huluobin authored Apr 14, 2020
  
  70d34f96
- 测试web hook地址 · ffacb3c1
  huluobin authored Apr 14, 2020
  
  ffacb3c1
- 美甲师通知 · 43760f5c
  huluobin authored Apr 14, 2020
  
  43760f5c
- 日志格式 · 3bdf181d
  huluobin authored Apr 14, 2020
  
  3bdf181d
- Merge branch 'technician_push' into branch · fd8c3051
```
# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/application-test.yml
```
  huluobin authored Apr 14, 2020
  fd8c3051
- 企业微信通知 · b6943319
  huluobin authored Apr 14, 2020
  
  b6943319
13 Apr, 2020 2 commits
- 采购搜索 · 0b362d2e
  huluobin authored Apr 13, 2020
  
  0b362d2e
- 日志输出格式 · eddfbc75
  huluobin authored Apr 13, 2020
  
  eddfbc75