Commits · 490a48ca2b7773ce7e4607aed95a8d8e0c92ce5d · huluobin / gogirl-miniapp-backend

08 Apr, 2020 6 commits
- update · 490a48ca
  huluobin authored Apr 08, 2020
  
  490a48ca
- log方案修改 · ba8224f7
  huluobin authored Apr 08, 2020
  
  ba8224f7
- merge · 678300dd
  huluobin authored Apr 08, 2020
  
  678300dd
- Merge branch 'master' into 3.5 · 086905bc
```
# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
#	src/main/java/com/gogirl/application/order/serve/impl/PayServiceImpl.java
#	src/main/java/com/gogirl/interfaces/xcx/PayController.java
```
  huluobin authored Apr 08, 2020
  086905bc
- 支付接口加锁。 · b8c557b5
  huluobin authored Apr 08, 2020
  
  b8c557b5
- 美甲师接口加锁、 · 130c84c4
```
微信重复支付根据金额做下单唯一处理。
```
  huluobin authored Apr 08, 2020
  130c84c4
07 Apr, 2020 33 commits
- update · 76a7b711
  huluobin authored Apr 07, 2020
  
  76a7b711
- 修改内部券免单券使用顺序 · 27fc644d
  huluobin authored Apr 07, 2020
  
  27fc644d
- update · c09931b1
  huluobin authored Apr 07, 2020
  
  c09931b1
- update · 522b4a3e
  huluobin authored Apr 07, 2020
  
  522b4a3e
- Merge branch 'master' into 3.5 · 6e6d878d
```
# Conflicts:
#	src/main/resources/mapper/order/OrderCommentMapper.xml
```
  huluobin authored Apr 07, 2020
  6e6d878d
- result-map · a62e56f2
  huluobin authored Apr 07, 2020
  
  a62e56f2
- update · 669cac5a
  huluobin authored Apr 07, 2020
  
  669cac5a
- update · a24860c5
  huluobin authored Apr 07, 2020
  
  a24860c5
- sub select · 24ee7e27
  huluobin authored Apr 07, 2020
  
  24ee7e27
- sub select · 267b4777
  huluobin authored Apr 07, 2020
  
  267b4777
- fix · 7612b46e
  huluobin authored Apr 07, 2020
  
  7612b46e
- 评论列表 · 1d8e507a
  huluobin authored Apr 07, 2020
  
  1d8e507a
- update · 30cc57ff
  huluobin authored Apr 07, 2020
  
  30cc57ff
- stash · 7656b0bc
  huluobin authored Apr 07, 2020
  
  7656b0bc
- 分页查询服务 · 4672c17f
  huluobin authored Apr 07, 2020
  
  4672c17f
- 分页参数全部换成新的。 · cafd219b
  huluobin authored Apr 07, 2020
  
  cafd219b
- update · fd3b77da
  huluobin authored Apr 07, 2020
  
  fd3b77da
- 订单详情接口修改 · 211d02cc
  huluobin authored Apr 07, 2020
  
  211d02cc
- 店员端、单个服务开单状态变更为服务中 · 862ac14a
  huluobin authored Apr 07, 2020
  
  862ac14a
- 店员端消费记录门店限制 · 35d00f1a
  huluobin authored Apr 07, 2020
  
  35d00f1a
- 朋友代付 · c7f7c928
  huluobin authored Apr 07, 2020
  
  c7f7c928
- 后台访问请求头 · 64d781b1
  huluobin authored Apr 07, 2020
  
  64d781b1
- 后台访问请求头 · a77a7c1d
  huluobin authored Apr 07, 2020
  
  a77a7c1d
- id set · be56b461
  huluobin authored Apr 07, 2020
  
  be56b461
- update · 8d056f5d
  huluobin authored Apr 07, 2020
  
  8d056f5d
- 循环依赖 · 57f619bc
  huluobin authored Apr 07, 2020
  
  57f619bc
- 后台接口访问地址配置 · 3d9690ba
  huluobin authored Apr 07, 2020
  
  3d9690ba
- 美甲师数据定时任务 · 0f13a603
  huluobin authored Apr 07, 2020
  
  0f13a603
- 业绩查询结果过滤店铺 · f5bcc352
  huluobin authored Apr 07, 2020
  
  f5bcc352
- 业绩查询结果过滤店铺 · bdf6b673
  huluobin authored Apr 07, 2020
  
  bdf6b673
- 测试环境fix · 1d916243
  huluobin authored Apr 07, 2020
  
  1d916243
- Merge remote-tracking branch 'origin/master' into 3.5 · d7f780c4
```
# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
```
  huluobin authored Apr 07, 2020
  d7f780c4
- 线上标签bug fix · 870319c2
  huluobin authored Apr 07, 2020
  
  870319c2
05 Apr, 2020 1 commit
- update · 7e2c1aed
  huluobin authored Apr 05, 2020
  
  7e2c1aed