gazebo
|
1cc643b42a
|
- 打开错误数据信息运营报警
|
2019-04-17 15:45:21 +08:00 |
|
gazebo
|
2cde3ba1b5
|
- GetStoreOrderCountInfo排除掉LOCK了的订单
|
2019-04-17 15:19:57 +08:00 |
|
gazebo
|
0f871847e9
|
- remove mtwmapi.MsgTypeOrderModified
|
2019-04-16 17:20:40 +08:00 |
|
gazebo
|
8083f2f638
|
! orderman中尽量使用事务
! orderman中全换成dao.DaoDB
|
2019-04-16 16:33:53 +08:00 |
|
gazebo
|
fc5cb88d8b
|
- 京东订单SkuID的容错处理
|
2019-04-16 16:10:49 +08:00 |
|
gazebo
|
bb02e6fe9e
|
- AdjustOrder
- CancelOrder
|
2019-04-14 17:01:29 +08:00 |
|
gazebo
|
0055892cb2
|
- 修复financial中的事务问题，某些情况上return nil需要回滚
|
2019-04-13 11:08:24 +08:00 |
|
gazebo
|
a12889d133
|
Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark
|
2019-04-13 09:34:17 +08:00 |
|
gazebo
|
53cc491a04
|
- order_Financial to order_financial
|
2019-04-13 09:33:46 +08:00 |
|
XJH-Rosy
|
d9785939cd
|
Accept Merge Request #12: (lcw -> mark)
Merge Request: 修复一些报警
Created By: @XJH-Rosy
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/12
|
2019-04-12 17:55:47 +08:00 |
|
gazebo
|
47ec846c36
|
- dao.FormalizeStoreStatus
|
2019-04-12 17:10:35 +08:00 |
|
renyutian
|
211a9928e0
|
结账信息收到重复订单推送处理
|
2019-04-12 16:30:59 +08:00 |
|
renyutian
|
70876759a1
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-12 16:26:16 +08:00 |
|
gazebo
|
77c5a16c08
|
- 接收门店状态消息，本地同步状态，京东暂时无效
|
2019-04-12 16:22:22 +08:00 |
|
renyutian
|
b342af3e7e
|
美团正向账单bug优化 skuid-->vendorskuid
|
2019-04-12 13:48:22 +08:00 |
|
gazebo
|
6e3b9a8215
|
- 将微信的备注改为店名相关的信息
|
2019-04-11 11:59:04 +08:00 |
|
renyutian
|
5a96290567
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-09 17:22:35 +08:00 |
|
gazebo
|
07f6b9d340
|
- 调用SelfDeliverDelivering要传骑手或店主手机号
|
2019-04-09 17:10:07 +08:00 |
|
renyutian
|
4e567f1687
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-09 15:19:28 +08:00 |
|
gazebo
|
6ccf2d984f
|
- fk
|
2019-04-09 15:18:46 +08:00 |
|
renyutian
|
657374d8ba
|
t2.delivery_confirm_time 不存在
|
2019-04-08 15:14:54 +08:00 |
|
renyutian
|
1094c325fa
|
美团公益捐款优化
|
2019-04-08 15:07:10 +08:00 |
|
renyutian
|
976a7d0d76
|
结账报错优化
|
2019-04-08 11:27:56 +08:00 |
|
gazebo
|
bb882a016a
|
Merge branch 'master' into lcw
|
2019-04-04 15:50:15 +08:00 |
|
gazebo
|
edaad0c9b6
|
- SelfDeliveringAndUpdateStatus中不应该依赖DeliveryFlag状态
|
2019-04-04 15:47:50 +08:00 |
|
renyutian
|
632aa6aa3d
|
结账第二期
|
2019-04-03 17:49:30 +08:00 |
|
gazebo
|
7b43e7d6e9
|
- 修复loadOrder中vendorOrderID为空时，取order_sku的BUG
|
2019-04-03 17:19:11 +08:00 |
|
gazebo
|
077a56b53e
|
- 检查发送短信结果，出错报警
|
2019-04-03 16:02:15 +08:00 |
|
gazebo
|
03e4f9e979
|
- 查询订单SKU相关的信息时，忽略已经删除的判断
|
2019-04-03 09:12:38 +08:00 |
|
gazebo
|
53d0e98a66
|
- 修复ordersku中取门店价错误使用unitPrice的问题
- 同步美团外卖时，将MtwmID设置为京西SKUID
|
2019-04-02 22:59:02 +08:00 |
|
gazebo
|
77aa71577f
|
- 主运单取消时设置订单TIMER，只有在配送中状态的订单才会马上新建运单
- 非自配送门店转3方配送至少要求拣货完成后5分钟才能操作
|
2019-04-02 18:45:01 +08:00 |
|
gazebo
|
97b497ce72
|
- 有订单消息错序，先收到接单消息，再收到新订单消息，导致接单TIMER不动作，这里补一下
|
2019-04-02 12:04:33 +08:00 |
|
gazebo
|
7d813f12b6
|
- 修复打印，发送新订单消息触发位置的错误
|
2019-04-02 09:15:57 +08:00 |
|
gazebo
|
60dc6407ee
|
- 改在接单时推送新订单消息
|
2019-04-01 23:33:05 +08:00 |
|
gazebo
|
60de9f64bd
|
+ PrintOrder
+ GetPrinterStatus
|
2019-04-01 23:29:47 +08:00 |
|
gazebo
|
d1d056077d
|
- 飞鹅打印机支持
|
2019-04-01 21:00:15 +08:00 |
|
gazebo
|
1a775d8fd6
|
- 输出平台订单操作相关的调试信息
|
2019-03-31 16:07:00 +08:00 |
|
gazebo
|
ef05d85fc2
|
- 梳理TIMER，去除TimerTypeBaseExpectedDeliveredTime
|
2019-03-31 15:46:41 +08:00 |
|
gazebo
|
d2fafe5ec0
|
- LimitUTF8StringLen
|
2019-03-31 12:13:47 +08:00 |
|
gazebo
|
12781c14be
|
+ 添加canOrderCreateWaybillNormally
|
2019-03-30 18:32:13 +08:00 |
|
gazebo
|
8ff383410b
|
- 重构canOrderCreateWaybillNormally
|
2019-03-30 18:21:19 +08:00 |
|
gazebo
|
b9915b1116
|
- CreateWaybillOnProvider4SavedOrder to CreateWaybillOnProviders4SavedOrder
|
2019-03-30 17:14:34 +08:00 |
|
gazebo
|
96fb2d9535
|
- 重构createWaybillOn3rdProviders
|
2019-03-30 17:11:23 +08:00 |
|
gazebo
|
10a444c895
|
- 重构创建运单策略
|
2019-03-30 15:00:59 +08:00 |
|
gazebo
|
8f17ec1675
|
- 强制召唤忽略价格
|
2019-03-30 10:59:06 +08:00 |
|
gazebo
|
4897c87bc1
|
- 梳理真实手机号相关的流程，ConsigneeMobile为真实手机号时ConsigneeMobile2也有值（之前不是这样的）
|
2019-03-28 15:56:50 +08:00 |
|
gazebo
|
cd99fc3e14
|
- 对于饿百与美团外卖订单，设置其PickDeadline
|
2019-03-28 14:08:44 +08:00 |
|
gazebo
|
34edcda30c
|
- fk
|
2019-03-28 13:40:47 +08:00 |
|
gazebo
|
ad2182f914
|
- 在mergeOrderStatusConfig要判断订单是否是真实订单
|
2019-03-28 12:51:17 +08:00 |
|
gazebo
|
bd93178f10
|
- fk
|
2019-03-28 12:45:30 +08:00 |
|