Commit Graph

4161 Commits

Author SHA1 Message Date
gazebo
c730a28f19 act.QueryActs 2019-12-23 18:14:57 +08:00
gazebo
65c09d395b Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-23 17:27:38 +08:00
gazebo
54aeef6b4a fk 2019-12-23 17:27:30 +08:00
苏尹岚
7800543f22 Accept Merge Request #100: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/100
2019-12-23 17:02:56 +08:00
苏尹岚
1e640ad6f4 订单预警 2019-12-23 17:01:58 +08:00
gazebo
01247221c4 SkuName.Upc改为*string(以支持null及添加唯一索引) 2019-12-23 16:15:58 +08:00
gazebo
23136cc467 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-23 15:44:42 +08:00
gazebo
fb599e610c fix ebai BaseFreightMoney 2019-12-23 15:44:25 +08:00
苏尹岚
2ee7c74e2a 投诉骑手 2019-12-23 15:41:43 +08:00
苏尹岚
943c4a723d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-23 15:38:01 +08:00
gazebo
c28247e6b7 +GoodsOrder.BaseFreightMoney 2019-12-23 15:35:34 +08:00
苏尹岚
a8439f38e1 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-23 15:29:27 +08:00
苏尹岚
166f5320d3 投诉骑手 2019-12-23 15:27:06 +08:00
gazebo
0b35c7a932 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-23 14:46:18 +08:00
gazebo
c6a99d73f8 up 2019-12-23 14:46:07 +08:00
苏尹岚
63e3ed0b4a Accept Merge Request #98: (yonghui -> mark)
Merge Request: 订单利润预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/98
2019-12-23 10:57:50 +08:00
苏尹岚
3f98af6a11 订单利润预警 2019-12-23 10:45:12 +08:00
gazebo
868cce8445 UpdateActPrice4StoreSkuNameNew中EarningPrice逻辑修改 2019-12-23 10:43:41 +08:00
苏尹岚
ddb129dbc0 订单预警 2019-12-23 10:32:40 +08:00
苏尹岚
cb94b34a88 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-23 10:30:05 +08:00
苏尹岚
846442f478 订单利润报警 2019-12-23 10:29:35 +08:00
gazebo
b846c1d124 京东cookie 2019-12-21 21:25:45 +08:00
gazebo
3040e0baf7 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-21 13:06:46 +08:00
gazebo
9e92f40a47 amendAndPruneStoreStuff中删除平台商品单个操作 2019-12-21 13:06:04 +08:00
苏尹岚
bd5a9e5e7d Accept Merge Request #97: (yonghui -> mark)
Merge Request: 获取各平台门店某商品价格
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/97
2019-12-20 18:11:07 +08:00
苏尹岚
693be23ca0 获取各平台门店商品价格 2019-12-20 17:59:27 +08:00
苏尹岚
5e93227546 获取平台门店商品价格 2019-12-20 17:24:36 +08:00
gazebo
f07862deeb 更新京东cookie 2019-12-20 17:12:12 +08:00
苏尹岚
ce4703b720 获取各平台商品门店价格 2019-12-20 16:58:19 +08:00
苏尹岚
da97aee570 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-20 16:23:02 +08:00
苏尹岚
968b062c2d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-20 16:21:43 +08:00
gazebo
d5e3457173 UpdateSkuSyncStatusForExPrefix改为使用thing_map 2019-12-20 16:21:05 +08:00
苏尹岚
dfd4a7a183 Accept Merge Request #96: (yonghui -> mark)
Merge Request: 平台门店名,刷新订单状态,商品名前缀,获取平台门店商品价
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/96
2019-12-20 16:00:31 +08:00
苏尹岚
af280510db Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-20 15:59:58 +08:00
苏尹岚
480132cafe 组合名字函数修改 2019-12-20 15:59:42 +08:00
gazebo
9987281578 dadadelivery notify 2019-12-20 14:49:55 +08:00
苏尹岚
7766c9428d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-20 14:41:53 +08:00
苏尹岚
da2440e971 获取平台门店商品价格 2019-12-20 14:41:21 +08:00
苏尹岚
b2e9f91373 商品前缀 2019-12-20 14:40:22 +08:00
苏尹岚
0a8a0faec4 exprefix索引,order修改 2019-12-20 14:32:14 +08:00
苏尹岚
fc588aec60 获取平台门店商品价格 2019-12-20 11:56:53 +08:00
gazebo
41f0d1fa3d up 2019-12-20 11:44:09 +08:00
苏尹岚
b8f7ffea18 获取门店商品价格 2019-12-20 11:40:04 +08:00
gazebo
53bd1ecb43 fk 2019-12-20 11:33:17 +08:00
gazebo
015e098a6c 订单打印去掉ActualPayPrice 2019-12-20 11:28:35 +08:00
gazebo
db37338060 up 2019-12-20 11:23:40 +08:00
苏尹岚
d6d4ab23bb Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-20 11:23:16 +08:00
苏尹岚
f72257d07c 获取平台门店商品价格 2019-12-20 11:22:41 +08:00
gazebo
48b6de0a6f +setFakeActualPayPrice 2019-12-20 11:20:02 +08:00
gazebo
163b27ca6e wxpay partner 2019-12-20 11:19:47 +08:00