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

Commit Graph

  • d1d49d464e 商品前缀名 苏尹岚 2019-12-20 10:00:13 +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
  • 7f88bad413 商品前缀修改 苏尹岚 2019-12-19 18:43:36 +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
  • 4c698967d0 wxpay to wxpayapi gazebo 2019-12-19 16:29:15 +08:00
  • 850c35c9d9 调整京西商城支付 gazebo 2019-12-19 16:20:10 +08:00
  • 415cc834fc maxStoreNameBind = 10000 gazebo 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
  • 84985a73fb 调整单的调试信息 gazebo 2019-12-19 14:10:45 +08:00
  • 9498542e59 修复订单调度定时器的BUG PickupGoods失败后判断订单状态如果是已经大于拣货完成，则忽略错误 gazebo 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
  • 1f1036b503 每晚自动同步时，全量同步 用AmendAndPruneStoreStuff替代PruneMissingStoreSkus与AddCreateFlagForJxStoreSku gazebo 2019-12-19 09:55:10 +08:00
  • 5f1c793a37 mtwm的partner.FuncUpdateStoreSkus改为1 gazebo 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
  • 2f9df63b10 必要时清除门店商品价格锁定时间 gazebo 2019-12-18 12:25:29 +08:00
  • af09cf0878 up gazebo 2019-12-18 12:06:52 +08:00
  • 51217978ba 门店商品添加锁定概念 gazebo 2019-12-18 11:55:48 +08:00
  • 12a1a23ac1 商品关键字修改 苏尹岚 2019-12-18 11:45:02 +08:00
  • d1cb4a8c8b 饿百输出回调消息 gazebo 2019-12-18 10:50:14 +08:00
  • 9a68b63b5e ebai.onOrderMsg gazebo 2019-12-18 10:41:04 +08:00
  • 2403c51764 修改不正常订单状态 苏尹岚 2019-12-18 10:29:09 +08:00
  • 8cd09089a8 组合名字函数修改 苏尹岚 2019-12-18 10:06:14 +08:00
  • 404a7b9040 jdsku冲突解决 苏尹岚 2019-12-18 09:17:43 +08:00
  • 2659c51d91 up gazebo 2019-12-18 08:39:02 +08:00
  • fc039600d5 DeleteSkusFromAct添加可选参数types gazebo 2019-12-18 08:30:32 +08:00
  • 169efcaa92 修改刷新活动结束状态逻辑 gazebo 2019-12-17 18:24:56 +08:00
  • 0cc04cc9d2 +OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel gazebo 2019-12-17 18:01:24 +08:00
  • 3feff96127 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-17 17:35:12 +08:00
  • 9fdae12a66 增加商品额外前缀 苏尹岚 2019-12-17 17:34:51 +08:00
  • 2c69e934f8 限制饿百平台的商家分类名长度 gazebo 2019-12-17 17:23:46 +08:00
  • b6e8c33012 去除老的sku与category相关多门店平台接口 gazebo 2019-12-17 16:51:45 +08:00
  • 64c7aec3c3 +jd.VenderAuditApplyCancelOrder gazebo 2019-12-17 15:55:46 +08:00
  • b2994f13cd Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-17 14:10:59 +08:00
  • a02dbdeacc 更改平台门店名称 苏尹岚 2019-12-17 14:10:44 +08:00
  • 6e3ee7c9c1 京西商城订单取消 gazebo 2019-12-17 14:05:43 +08:00
  • d5f2273d79 +dao.LoadPendingOrders gazebo 2019-12-17 14:00:01 +08:00
  • d7f9f30178 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-17 11:25:44 +08:00
  • d38582709f act.SyncAct gazebo 2019-12-17 11:25:22 +08:00
  • 81ea19b80a Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-17 10:43:04 +08:00
  • 57fb6ac078 更新门店公告 苏尹岚 2019-12-17 10:42:48 +08:00
  • 8d51d77529 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-17 10:07:23 +08:00
  • 16b772f13c Merge branch 'master' into mark gazebo 2019-12-17 10:07:13 +08:00
  • 272462f3eb up gazebo 2019-12-17 09:46:56 +08:00
  • 9e1ec73200 去除realEarningPrice gazebo 2019-12-17 09:35:28 +08:00
  • 7d944f4ac6 刷新京东门店等级 苏尹岚 2019-12-17 09:04:05 +08:00
  • f5b7b03044 刷新京东门店等级 苏尹岚 2019-12-17 08:57:51 +08:00
  • 2064cc11f5 刷新京东门店等级 苏尹岚 2019-12-17 08:53:07 +08:00
  • ac6372888d 刷新京东等级 苏尹岚 2019-12-16 18:42:29 +08:00
  • c55211fa53 刷新京东等级 苏尹岚 2019-12-16 18:40:39 +08:00
  • 365f69f8fa 刷新京东等级 苏尹岚 2019-12-16 18:38:48 +08:00
  • 6afbfb156a 刷新京东等级 苏尹岚 2019-12-16 18:32:32 +08:00
  • b985b1a907 fk gazebo 2019-12-16 18:26:29 +08:00
  • a0fee1f756 fk gazebo 2019-12-16 18:21:16 +08:00
  • f6c1b70484 Accept Merge Request #91: (yonghui -> mark) Merge Request: 推荐分类 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/91 苏尹岚 2019-12-16 18:08:02 +08:00
  • b0cd64a358 +store/sku/GetStoreCategories gazebo 2019-12-16 18:05:26 +08:00
  • c65032474e Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-16 16:52:54 +08:00
  • be0bcf63f4 根据名字查询京东upc 苏尹岚 2019-12-16 16:52:34 +08:00
  • 7296b5cca3 GetEffectiveActStoreSkuInfo, ActTypeAll gazebo 2019-12-16 16:46:05 +08:00
  • 84f2c8930c GetEffectiveActStoreSkuInfo添加actType参数 修复ActStoreSkuParam2Model中调用GetEffectiveActStoreSkuInfo的bug gazebo 2019-12-16 16:39:39 +08:00
  • 21bb51ebb0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-16 16:17:50 +08:00
  • 4772caf080 Store添加AutoReplyType，用于标识（订单）自动回复类型 gazebo 2019-12-16 16:17:02 +08:00
  • 245e793ce3 根据名字查询upc码，获取京东等级修改 苏尹岚 2019-12-16 16:12:56 +08:00
  • 1b4de9a762 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-16 14:21:48 +08:00
  • 1f1835fa2d 根据名字查询京东upc 苏尹岚 2019-12-16 14:21:19 +08:00
  • eb78052a13 删除没有商家ID的京东SKU时，先设置商家ID后再删除 gazebo 2019-12-16 11:56:35 +08:00
  • f5166d59b6 推荐分类修改 苏尹岚 2019-12-16 11:47:08 +08:00
  • 8e9d712464 推荐分类修改 苏尹岚 2019-12-16 11:28:03 +08:00
  • efdcebdaa9 推荐分类修改 苏尹岚 2019-12-16 11:16:34 +08:00
  • 146b801e5d Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-16 11:03:10 +08:00
  • 6afa912e54 推荐分类修改 苏尹岚 2019-12-16 11:03:00 +08:00
  • f535cf2eeb 推荐分类修改 苏尹岚 2019-12-16 11:02:20 +08:00
  • ff6cd228a6 jd.postFakeMsg中正确设置AppKey gazebo 2019-12-16 10:19:54 +08:00
  • 65d6ac4268 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-16 09:35:17 +08:00
  • cd267503f8 fk gazebo 2019-12-16 09:35:05 +08:00
  • fc5f344a5e Accept Merge Request #85: (yonghui -> mark) Merge Request: 根据商品名查询京东upc码 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/85 苏尹岚 2019-12-16 09:25:57 +08:00
  • 0f07668775 根据名字查京东upc码 苏尹岚 2019-12-16 09:25:04 +08:00
  • f1a7440e3e debug AppKey2OrgCode gazebo 2019-12-16 09:21:25 +08:00
  • 0ea872ab39 newGetFullStoreSkus调整 gazebo 2019-12-13 22:23:17 +08:00
  • 572fc64d7d 多平台商品库没有正常创建，直接跳过 gazebo 2019-12-13 21:36:38 +08:00
  • 99efedfd92 多门店平台同步门店商品时，处理商品库没有创建的情况 gazebo 2019-12-13 21:24:27 +08:00
  • fb7e3566ea 修复CalUpcCheckSum结果为10的bug gazebo 2019-12-13 20:00:53 +08:00
  • 3aa87369ec Accept Merge Request #84: (yonghui -> mark) Merge Request: 根据名字查询京东upc编码等 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/84 苏尹岚 2019-12-13 18:41:20 +08:00
  • b428c0236e GenFakeUPC考虑校验规则 gazebo 2019-12-13 18:39:54 +08:00
  • 593612ed94 根据名字查询京东upc 苏尹岚 2019-12-13 18:35:36 +08:00
  • f7418d2581 部署时，不再备份可执行文件 gazebo 2019-12-13 17:58:29 +08:00
  • a576389993 up gazebo 2019-12-13 17:34:15 +08:00
  • f941ea1807 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-13 17:28:23 +08:00
  • 7aad8398cf jd.isSkuMustHaveUpc gazebo 2019-12-13 17:28:04 +08:00
  • 3412f95380 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-13 16:55:10 +08:00
  • ebad9c1290 获取京东门店等级修改 苏尹岚 2019-12-13 16:54:57 +08:00
  • 032bb05157 京东平台，不为份的SKU，如果没有设置upc，自动生成一个假的 gazebo 2019-12-13 16:41:16 +08:00
  • 7615cfa6bc 创建结算活动不判断门店状态 gazebo 2019-12-13 16:40:37 +08:00
  • 27acc3b814 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-13 16:38:35 +08:00