gazebo
|
3ee2e72a5e
|
美团饿百打包费改为统一系统参数
|
2019-12-30 18:07:26 +08:00 |
|
gazebo
|
f1d025eb15
|
+StoreMap.BoxFee
美团外卖支持打包袋费，美团商品统一添加1角打包费
|
2019-12-30 16:50:32 +08:00 |
|
gazebo
|
cee131b197
|
SetThingMapSyncStatus中的bug修复
|
2019-12-30 15:32:46 +08:00 |
|
gazebo
|
a56ebdf5dd
|
sku2Update中去掉sku.SkuID == 0的判断（只要sku.NameID == 0判断就够了）
|
2019-12-30 09:45:02 +08:00 |
|
gazebo
|
f5f3aef933
|
GetOrderWaybillInfo中当isGetPos为true时，暂时忽略状态检查
|
2019-12-30 09:42:14 +08:00 |
|
gazebo
|
384daa4819
|
fk
|
2019-12-28 20:34:36 +08:00 |
|
gazebo
|
9bd240a22f
|
处理美团AppFood中可能没有sku的情况
|
2019-12-27 23:02:36 +08:00 |
|
gazebo
|
1ea84798f3
|
up
|
2019-12-27 18:02:05 +08:00 |
|
gazebo
|
3547ee4f5e
|
美团活动支持秒杀
|
2019-12-27 17:47:06 +08:00 |
|
gazebo
|
1093ae8829
|
up
|
2019-12-27 11:31:55 +08:00 |
|
gazebo
|
1a150754f8
|
自提核销只处理京东平台
|
2019-12-26 17:50:59 +08:00 |
|
gazebo
|
4aa2984048
|
comment
|
2019-12-26 17:43:17 +08:00 |
|
gazebo
|
447e6c2409
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-26 17:29:03 +08:00 |
|
gazebo
|
5361c0cabb
|
Waybill添加TipFee，在订单完成时也会更新，ActualFee肯定会有值，当成总费用
|
2019-12-26 17:28:28 +08:00 |
|
苏尹岚
|
fad75b7937
|
Accept Merge Request #118: (yonghui -> mark)
Merge Request: 投诉骑手
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/118
|
2019-12-26 17:10:48 +08:00 |
|
苏尹岚
|
c22581636d
|
投诉骑手
|
2019-12-26 17:10:20 +08:00 |
|
苏尹岚
|
c6a28afa4a
|
Accept Merge Request #117: (yonghui -> mark)
Merge Request: 投诉骑手
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/117
|
2019-12-26 17:03:11 +08:00 |
|
苏尹岚
|
e95a37789e
|
投诉骑手
|
2019-12-26 17:02:49 +08:00 |
|
苏尹岚
|
2f3514d901
|
投诉骑手
|
2019-12-26 17:00:36 +08:00 |
|
苏尹岚
|
edbe3a92f7
|
Accept Merge Request #116: (yonghui -> mark)
Merge Request: 根据skuid 批量关注可售
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/116
|
2019-12-26 16:24:13 +08:00 |
|
苏尹岚
|
0f4ed3f31e
|
投诉原因
|
2019-12-26 16:23:28 +08:00 |
|
gazebo
|
381d1b2f21
|
调整加订单配送小费逻辑，添加美团外卖平台支持
|
2019-12-26 16:19:04 +08:00 |
|
gazebo
|
f13a8bbea2
|
OrderStatusWaybillTipChanged描述
|
2019-12-26 14:33:58 +08:00 |
|
gazebo
|
deadc8f563
|
UpdateOrderWaybillTip
|
2019-12-26 14:18:16 +08:00 |
|
gazebo
|
9559fc6420
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-26 10:54:33 +08:00 |
|
苏尹岚
|
d1a8d45933
|
部分关注商品修改
|
2019-12-26 10:37:09 +08:00 |
|
gazebo
|
256b7b6593
|
校验upc
|
2019-12-26 09:55:49 +08:00 |
|
苏尹岚
|
9a05638ad2
|
投诉骑手增加测试判断
|
2019-12-26 09:43:24 +08:00 |
|
苏尹岚
|
b4ab96c1fa
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-26 09:24:30 +08:00 |
|
苏尹岚
|
f8e6fd4bdd
|
根据excel中skuid关注商品
|
2019-12-26 09:24:14 +08:00 |
|
苏尹岚
|
35ceb53467
|
Accept Merge Request #115: (yonghui -> mark)
Merge Request: 门店促销
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/115
|
2019-12-26 09:15:47 +08:00 |
|
苏尹岚
|
6f84d79901
|
门店促销
|
2019-12-26 09:14:26 +08:00 |
|
苏尹岚
|
50b558362a
|
Accept Merge Request #114: (yonghui -> mark)
Merge Request: 投诉骑手，门店促销
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/114
|
2019-12-26 09:06:22 +08:00 |
|
苏尹岚
|
90cbc5c81f
|
门店促销
|
2019-12-26 09:05:19 +08:00 |
|
gazebo
|
44a0caade0
|
关闭输日志
|
2019-12-26 08:42:53 +08:00 |
|
苏尹岚
|
11310fc16d
|
投诉骑手
|
2019-12-26 08:17:14 +08:00 |
|
gazebo
|
6c13f113e8
|
jdapi.AdjustOrder处理重复
|
2019-12-25 21:54:16 +08:00 |
|
gazebo
|
f69afe7c4a
|
AdjustOrder与PartRefundOrder中，对于商品进行可能的合并操作
|
2019-12-25 21:38:40 +08:00 |
|
gazebo
|
6022d24634
|
GetOrderWaybillInfo可选参数：isGetPos支持获取运单骑手实时信息
|
2019-12-25 20:14:53 +08:00 |
|
苏尹岚
|
70e2d05549
|
投诉骑手
|
2019-12-25 18:39:13 +08:00 |
|
苏尹岚
|
3983e9d5a9
|
投诉骑手
|
2019-12-25 18:37:00 +08:00 |
|
苏尹岚
|
8b86f84966
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-25 18:25:30 +08:00 |
|
gazebo
|
9e40e3942a
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-25 18:25:00 +08:00 |
|
苏尹岚
|
a305be5400
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-25 18:14:19 +08:00 |
|
苏尹岚
|
6f4cbedada
|
门店促销指数
|
2019-12-25 18:14:03 +08:00 |
|
苏尹岚
|
b061bcb18b
|
Accept Merge Request #111: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/111
|
2019-12-25 18:12:33 +08:00 |
|
苏尹岚
|
99c20d3712
|
订单预警
|
2019-12-25 18:11:45 +08:00 |
|
gazebo
|
7bec6fa523
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-25 16:58:46 +08:00 |
|
gazebo
|
1f03a84fa6
|
修复onAfsOrderMsg中afsOrder没有正确赋值的bug
|
2019-12-25 16:39:01 +08:00 |
|
苏尹岚
|
a8e3d512d2
|
Accept Merge Request #110: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/110
|
2019-12-25 15:35:38 +08:00 |
|