Commit Graph

  • 1f03a84fa6 修复onAfsOrderMsg中afsOrder没有正确赋值的bug gazebo 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
  • 11149487b5 订单预警 苏尹岚 2019-12-25 15:34:55 +08:00
  • d17a4ae594 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-25 15:33:17 +08:00
  • 880d2aedc0 配送相关接口调整 gazebo 2019-12-25 15:32:58 +08:00
  • aa3dd73b27 根据skuID关注部分商品 苏尹岚 2019-12-25 15:11:49 +08:00
  • 938e42a86b 商品前缀 苏尹岚 2019-12-25 13:49:23 +08:00
  • b998a8938d 商品前缀 苏尹岚 2019-12-25 11:55:07 +08:00
  • c16e0dbab5 商品前缀 苏尹岚 2019-12-25 11:49:25 +08:00
  • f924735152 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-25 11:44:25 +08:00
  • 54fb48e6f1 根据skuID更新 苏尹岚 2019-12-25 11:44:18 +08:00
  • b8701ca850 upc gazebo 2019-12-25 11:11:03 +08:00
  • 043e5ae01d getSkuSaleStatus gazebo 2019-12-25 11:10:44 +08:00
  • bc5baf2a7c Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-24 21:01:22 +08:00
  • c124acc53a 商品前缀 suyl 2019-12-24 21:00:02 +08:00
  • 9556634499 畅销商品 苏尹岚 2019-12-24 18:24:01 +08:00
  • afa708ab99 畅销商品 苏尹岚 2019-12-24 18:11:13 +08:00
  • e811b3fc75 畅销商品 苏尹岚 2019-12-24 17:51:27 +08:00
  • 4f3e97268f Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-24 17:47:47 +08:00
  • 5504b43d4f ebai.CreateStoreSkus中,饿百平台有BUG,会导致新建一个之前删除的商品时,信息不会及时更新,强制刷新一下 gazebo 2019-12-24 17:47:22 +08:00
  • afd3bbfea3 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-24 17:27:31 +08:00
  • ae043ed566 畅销商品 苏尹岚 2019-12-24 17:27:06 +08:00
  • 73763af5fe Accept Merge Request #102: (yonghui -> mark) Merge Request: 畅销商品 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/102 苏尹岚 2019-12-24 16:40:55 +08:00
  • a2fe344e18 根据skuid批量关注 苏尹岚 2019-12-24 16:39:58 +08:00
  • 5ef3893f48 ForceUpdateVendorPrice中忽略不存在错 gazebo 2019-12-24 16:29:31 +08:00
  • 9a76d07868 StoreSkuBind.MtwmID建索引 gazebo 2019-12-24 15:29:07 +08:00
  • 26bfe04b7b up gazebo 2019-12-24 14:45:33 +08:00
  • ac10d134ea 畅销商品 苏尹岚 2019-12-24 14:07:28 +08:00
  • 7408b87742 畅销商品 苏尹岚 2019-12-24 13:39:52 +08:00
  • 9a494425b6 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-24 13:33:44 +08:00
  • 471b2c63fc 畅销商品 苏尹岚 2019-12-24 13:33:27 +08:00
  • 85d909234d 饿百在配送中状态时,尝试刷新TotalShopMoney gazebo 2019-12-24 12:12:34 +08:00
  • 86def54ea6 畅销商品 苏尹岚 2019-12-24 11:55:52 +08:00
  • 52ea751e45 畅销商品 苏尹岚 2019-12-24 11:52:34 +08:00
  • eff05244dc 畅销商品 苏尹岚 2019-12-24 11:52:23 +08:00
  • f98ea4eefa 畅销商品 苏尹岚 2019-12-24 11:49:08 +08:00
  • 322a298223 畅销商品 苏尹岚 2019-12-24 11:41:47 +08:00
  • 5ab567ad77 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-24 11:39:28 +08:00
  • 70ecbf5114 畅销商品 苏尹岚 2019-12-24 11:39:15 +08:00
  • 904acbf3de updateStoresSkusWithoutSync中 关注商品时,如果有删除的相应门店商品,使用恢复删除(而不是新建) 需要处理,在删除某个门店商品,同步失败的情况下,又把商品重新关注。 所以统一处理成恢复删除的记录,这样避免问题 gazebo 2019-12-24 11:11:13 +08:00
  • f6e7cb2551 dao.GetOrders中,后台导出订单SKU结算信息时,SKU的earning_price在没有结算信息时,填0。 gazebo 2019-12-24 10:58:06 +08:00
  • a8dbf89159 fk gazebo 2019-12-24 10:44:46 +08:00
  • 3d8781ca0f UpdateActPrice4StoreSkuNameNew gazebo 2019-12-24 10:41:46 +08:00
  • e8352cd412 fk gazebo 2019-12-24 09:27:01 +08:00
  • 20aeabd160 去掉SkuName.Name的单独索引 gazebo 2019-12-23 18:28:21 +08:00
  • 33a628106b Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-23 18:23:34 +08:00
  • ee0b400294 SkuName添加Upc, DeletedAt唯一索引 gazebo 2019-12-23 18:23:05 +08:00
  • c730a28f19 act.QueryActs gazebo 2019-12-23 18:14:57 +08:00
  • d86a0e1b26 Accept Merge Request #101: (yonghui -> mark) Merge Request: 订单预警 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/101 苏尹岚 2019-12-23 18:12:48 +08:00
  • a1bdf6cde3 订单预警 苏尹岚 2019-12-23 18:12:03 +08:00
  • 758e0f23f2 订单预警 苏尹岚 2019-12-23 17:50:11 +08:00
  • 65c09d395b Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-23 17:27:38 +08:00
  • 54aeef6b4a fk gazebo 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
  • 01247221c4 SkuName.Upc改为*string(以支持null及添加唯一索引) gazebo 2019-12-23 16:15:14 +08:00
  • 23136cc467 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-23 15:44:42 +08:00
  • fb599e610c fix ebai BaseFreightMoney gazebo 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
  • c28247e6b7 +GoodsOrder.BaseFreightMoney gazebo 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
  • 0b35c7a932 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-23 14:46:18 +08:00
  • c6a99d73f8 up gazebo 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
  • 868cce8445 UpdateActPrice4StoreSkuNameNew中EarningPrice逻辑修改 gazebo 2019-12-23 10:31:00 +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
  • b846c1d124 京东cookie gazebo 2019-12-21 21:25:45 +08:00
  • 3040e0baf7 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-21 13:06:46 +08:00
  • 9e92f40a47 amendAndPruneStoreStuff中删除平台商品单个操作 gazebo 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
  • f07862deeb 更新京东cookie gazebo 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
  • d5e3457173 UpdateSkuSyncStatusForExPrefix改为使用thing_map gazebo 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
  • 9987281578 dadadelivery notify gazebo 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
  • 41f0d1fa3d up gazebo 2019-12-20 11:44:09 +08:00
  • b8f7ffea18 获取门店商品价格 苏尹岚 2019-12-20 11:40:04 +08:00
  • 53bd1ecb43 fk gazebo 2019-12-20 11:33:17 +08:00
  • 015e098a6c 订单打印去掉ActualPayPrice gazebo 2019-12-20 11:28:35 +08:00
  • db37338060 up gazebo 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
  • 48b6de0a6f +setFakeActualPayPrice gazebo 2019-12-20 11:20:02 +08:00
  • 163b27ca6e wxpay partner gazebo 2019-12-20 11:19:47 +08:00