liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 3547ee4f5e 美团活动支持秒杀 gazebo 2019-12-27 17:47:06 +08:00
  • 1093ae8829 up gazebo 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
  • 1a150754f8 自提核销只处理京东平台 gazebo 2019-12-26 17:50:59 +08:00
  • 4aa2984048 comment gazebo 2019-12-26 17:43:17 +08:00
  • 447e6c2409 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-26 17:29:03 +08:00
  • 5361c0cabb Waybill添加TipFee，在订单完成时也会更新，ActualFee肯定会有值，当成总费用 gazebo 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
  • 381d1b2f21 调整加订单配送小费逻辑，添加美团外卖平台支持 gazebo 2019-12-26 16:19:04 +08:00
  • f13a8bbea2 OrderStatusWaybillTipChanged描述 gazebo 2019-12-26 14:33:58 +08:00
  • deadc8f563 UpdateOrderWaybillTip gazebo 2019-12-26 14:18:16 +08:00
  • 9559fc6420 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-26 10:54:33 +08:00
  • d1a8d45933 部分关注商品修改 苏尹岚 2019-12-26 10:37:09 +08:00
  • 256b7b6593 校验upc gazebo 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
  • 44a0caade0 关闭输日志 gazebo 2019-12-26 08:42:53 +08:00
  • 11310fc16d 投诉骑手 苏尹岚 2019-12-26 08:17:14 +08:00
  • 6c13f113e8 jdapi.AdjustOrder处理重复 gazebo 2019-12-25 21:54:16 +08:00
  • f69afe7c4a AdjustOrder与PartRefundOrder中，对于商品进行可能的合并操作 gazebo 2019-12-25 21:38:40 +08:00
  • 6022d24634 GetOrderWaybillInfo可选参数：isGetPos支持获取运单骑手实时信息 gazebo 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
  • 9e40e3942a Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 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
  • 7bec6fa523 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-25 16:58:46 +08:00
  • 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