liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,282 Commits 4 Branches 0 Tags
3564b491f1b832eb2af6e7bf86cf548391eb232a
Commit Graph

4282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
苏尹岚
3564b491f1 价格统计 2019-12-31 17:11:28 +08:00
苏尹岚
71c9a173b9 价格统计 2019-12-31 14:47:17 +08:00
苏尹岚
7c0e3a5e5c Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-31 13:31:53 +08:00
苏尹岚
0f2058de84 自动关注 2019-12-31 13:31:29 +08:00
gazebo
c6760a6bcc SyncStores 2019-12-31 11:50:45 +08:00
gazebo
229601c11e +onSysConfigChanged 2019-12-31 10:28:52 +08:00
gazebo
174727bafc comment 2019-12-31 09:42:55 +08:00
gazebo
d01efb378c 处理饿百订单有时取不到一些字段的情况 2019-12-31 09:42:06 +08:00
gazebo
d3a02ef958 打包费参数有效性检查 2019-12-30 18:35:49 +08:00
gazebo
3ee2e72a5e 美团饿百打包费改为统一系统参数 2019-12-30 18:07:26 +08:00
苏尹岚
2c5d4801b0 价格统计 2019-12-30 17:47:48 +08:00
苏尹岚
7cb1df0886 价格统计 2019-12-30 17:38:21 +08:00
苏尹岚
e4b2a71ec6 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-30 17:32:32 +08:00
苏尹岚
0432d97cb1 价格统计 2019-12-30 17:32:22 +08:00
苏尹岚
2548908b68 价格统计 2019-12-30 17:08:17 +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
苏尹岚
e82d9851de Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-30 15:11:29 +08:00
苏尹岚
cb135a0adf 价格统计 2019-12-30 15:11:18 +08:00
苏尹岚
197848a52b 价格统计 2019-12-30 15:09:34 +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
苏尹岚
0b9240d8e0 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-30 08:25:09 +08:00
苏尹岚
6467def8b4 差评补款 2019-12-30 08:25:01 +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
苏尹岚
b068d07c33 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-27 17:52:23 +08:00
苏尹岚
ed8627c58a 根据skuid批量关注 2019-12-27 17:51:33 +08:00
gazebo
3547ee4f5e 美团活动支持秒杀 2019-12-27 17:47:06 +08:00
gazebo
1093ae8829 up 2019-12-27 11:31:55 +08:00
苏尹岚
78238c806e 差评补款 2019-12-26 18:49:28 +08:00
苏尹岚
cfb1a2e052 差评补款 2019-12-26 18:36:58 +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