renyutian
|
48ab6f7e75
|
美团尝试
|
2019-04-04 17:58:08 +08:00 |
|
renyutian
|
1745509543
|
Merge branch 'lcw' of https://git.dev.tencent.com/XJH-Rosy/jx-callback into lcw
|
2019-04-04 17:03:25 +08:00 |
|
renyutian
|
7a3a914839
|
bug 优化
|
2019-04-04 17:02:48 +08:00 |
|
gazebo
|
a0e1875911
|
Merge branch 'lcw' of git.coding.net:XJH-Rosy/jx-callback into lcw
|
2019-04-04 15:50:33 +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
|
18d7a24ba5
|
Merge branch 'lcw' of https://git.dev.tencent.com/XJH-Rosy/jx-callback into lcw
|
2019-04-04 14:52:42 +08:00 |
|
renyutian
|
d276ae55aa
|
bug处理
|
2019-04-04 14:51:10 +08:00 |
|
gazebo
|
e61ae7a1b0
|
Merge branch 'master' into lcw
|
2019-04-04 12:37:14 +08:00 |
|
gazebo
|
5986c5ad17
|
- 饿百状态调整
|
2019-04-04 12:36:00 +08:00 |
|
renyutian
|
f28be52906
|
格式优化
|
2019-04-04 10:16:35 +08:00 |
|
renyutian
|
53733320c2
|
报错优化
|
2019-04-04 09:39:21 +08:00 |
|
gazebo
|
2c457a38d5
|
- 修改美团外卖门店要报错"商家已接入美团配送，不可修改门店配送相关信息"，还是只修改门店状态与营业时间
|
2019-04-03 20:42:02 +08:00 |
|
gazebo
|
2d54c5510e
|
- up
|
2019-04-03 20:34:43 +08:00 |
|
gazebo
|
886fde0800
|
- 同步美团外卖门店信息
|
2019-04-03 20:30:11 +08:00 |
|
gazebo
|
d20d6e1df4
|
- 查询门店关键字在门店地址中查询
|
2019-04-03 20:22:19 +08:00 |
|
gazebo
|
66869ed853
|
- afterSaleBillStatus
|
2019-04-03 18:35:34 +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
|
5f6d40caa1
|
- 将FlatMap，Struct2FlatMap从jxutils移到utils中
|
2019-04-03 10:47:47 +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
|
2b539fc531
|
- 转发饿百的运单状态给结算流程
|
2019-04-02 16:31:07 +08:00 |
|
gazebo
|
590024e534
|
- 人民币符号用半角
|
2019-04-02 15:07:54 +08:00 |
|
gazebo
|
c5d1eb78c5
|
- Interface2FloatWithDefault to Interface2Float64WithDefault
|
2019-04-02 14:33:31 +08:00 |
|
gazebo
|
38b32cc10d
|
- 打印格式调整
|
2019-04-02 14:16:08 +08:00 |
|
gazebo
|
97b497ce72
|
- 有订单消息错序，先收到接单消息，再收到新订单消息，导致接单TIMER不动作，这里补一下
|
2019-04-02 12:04:33 +08:00 |
|
gazebo
|
cdacf99a92
|
- 实际支付添加货币符号
|
2019-04-02 09:58:49 +08:00 |
|
gazebo
|
b5d1101e78
|
- 返回printer_sn和printer_key在GetStores中
|
2019-04-02 09:50:47 +08:00 |
|
gazebo
|
22f9ba419d
|
- 调整网络打印机的打印格式
|
2019-04-02 09:35:49 +08:00 |
|
gazebo
|
7d813f12b6
|
- 修复打印，发送新订单消息触发位置的错误
|
2019-04-02 09:15:57 +08:00 |
|
gazebo
|
73e16b2e57
|
- json for PrinterStatus
|
2019-04-01 23:47:11 +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
|
28f24b1a7a
|
- wsc.onOrderMsg中要处理模拟消息`
|
2019-04-01 18:15:28 +08:00 |
|
gazebo
|
4a5e0bb5c5
|
- debug wsc partner handler
|
2019-04-01 18:08:00 +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
|
715b44e592
|
- OrderStatusMsg: "通知消息"
|
2019-03-30 17:19:37 +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
|
68b5ec38b6
|
- 查不到美团配送价格时报警
|
2019-03-30 11:30:12 +08:00 |
|
gazebo
|
8f17ec1675
|
- 强制召唤忽略价格
|
2019-03-30 10:59:06 +08:00 |
|