Commit Graph

3805 Commits

Author SHA1 Message Date
gazebo
fb599e610c fix ebai BaseFreightMoney 2019-12-23 15:44:25 +08:00
gazebo
c28247e6b7 +GoodsOrder.BaseFreightMoney 2019-12-23 15:35:34 +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
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
苏尹岚
693be23ca0 获取各平台门店商品价格 2019-12-20 17:59:27 +08:00
苏尹岚
5e93227546 获取平台门店商品价格 2019-12-20 17:24:36 +08:00
苏尹岚
ce4703b720 获取各平台商品门店价格 2019-12-20 16:58:19 +08:00
gazebo
d5e3457173 UpdateSkuSyncStatusForExPrefix改为使用thing_map 2019-12-20 16:21:05 +08:00
苏尹岚
480132cafe 组合名字函数修改 2019-12-20 15:59:42 +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
苏尹岚
fa6f86a01f 商品名前缀 2019-12-20 09:30:52 +08:00
苏尹岚
0623da776b 商品关键字 2019-12-20 09:16:56 +08:00
苏尹岚
f5db2daee2 获取商品平台价 2019-12-20 08:57:52 +08:00
苏尹岚
5438e90021 获取某商品各平台价 2019-12-20 08:39:23 +08:00
苏尹岚
58e3066d19 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 18:40:58 +08:00
苏尹岚
dad7a5a926 获取某个商品平台价,商品名前缀 2019-12-19 18:40:46 +08:00
gazebo
4c698967d0 wxpay to wxpayapi 2019-12-19 16:29:15 +08:00
gazebo
850c35c9d9 调整京西商城支付 2019-12-19 16:20:10 +08:00
gazebo
415cc834fc maxStoreNameBind = 10000 2019-12-19 15:57:18 +08:00
苏尹岚
a3c236d281 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 15:24:31 +08:00
gazebo
84985a73fb 调整单的调试信息 2019-12-19 14:10:45 +08:00
gazebo
9498542e59 修复订单调度定时器的BUG
PickupGoods失败后判断订单状态如果是已经大于拣货完成,则忽略错误
2019-12-19 12:07:15 +08:00
苏尹岚
480bfb4ed8 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 10:55:59 +08:00
苏尹岚
16823207c9 商品名前缀 2019-12-19 10:55:41 +08:00
gazebo
1f1036b503 每晚自动同步时,全量同步
用AmendAndPruneStoreStuff替代PruneMissingStoreSkus与AddCreateFlagForJxStoreSku
2019-12-19 09:55:10 +08:00
gazebo
5f1c793a37 mtwm的partner.FuncUpdateStoreSkus改为1 2019-12-19 08:28:44 +08:00
苏尹岚
be8a98dc90 同步商品名 2019-12-18 18:35:14 +08:00
苏尹岚
7fdb107e6f Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-18 15:19:39 +08:00
苏尹岚
990f3a2da2 pr修改 2019-12-18 15:19:22 +08:00