Commit Graph

  • 27e13ecb99 fk gazebo 2020-01-08 18:40:39 +08:00
  • ce41890da7 alipayAppID gazebo 2020-01-08 18:36:55 +08:00
  • 3ea689951b updateStoresSkusWithoutSync中改价是判断价格是否一致 gazebo 2020-01-08 18:32:29 +08:00
  • fbabc83524 Accept Merge Request #131: (yonghui -> mark) Merge Request: 增加同步返回错误 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/131 苏尹岚 2020-01-08 18:09:56 +08:00
  • 7101582522 增加同步错误 苏尹岚 2020-01-08 18:09:04 +08:00
  • c196e7aab9 添加支付宝登录方式:alipaycode gazebo 2020-01-08 18:06:53 +08:00
  • 19ab93ab1e 同步错误 苏尹岚 2020-01-08 16:07:36 +08:00
  • 90513226e9 同步错误 苏尹岚 2020-01-08 15:50:55 +08:00
  • 2b3d7ce83a 同步错误 苏尹岚 2020-01-08 15:35:53 +08:00
  • 74e52a0d94 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2020-01-08 14:41:06 +08:00
  • e5db4f27b1 操作日志 苏尹岚 2020-01-08 14:26:31 +08:00
  • 510b9e8483 修复处理投递失败的BUG gazebo 2020-01-08 11:38:46 +08:00
  • a56a5b1ec7 OrderSkuDiscountTypeTe gazebo 2020-01-08 11:12:12 +08:00
  • b121695eef Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2020-01-08 10:45:36 +08:00
  • 68494268ce Accept Merge Request #130: (yonghui -> mark) Merge Request: 根据skuid部分关注 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/130 苏尹岚 2020-01-08 10:43:01 +08:00
  • a3e4503081 根据skuid部分关注 苏尹岚 2020-01-08 10:42:34 +08:00
  • 256c00d31b Accept Merge Request #129: (yonghui -> mark) Merge Request: 根据skuid 部分关注 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/129 苏尹岚 2020-01-08 10:41:14 +08:00
  • 9c6b27ed56 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-08 10:39:19 +08:00
  • 82eb16ba66 商品部分关注 苏尹岚 2020-01-08 10:39:16 +08:00
  • b92cff3338 !token改为7部分 gazebo 2020-01-08 10:38:55 +08:00
  • 4a51bfca9b +StoresOrderSaleInfo.DistanceFreightMoney, WaybillTipMoney gazebo 2020-01-08 10:38:08 +08:00
  • d7ae6eb9a2 屏蔽接口 苏尹岚 2020-01-08 10:30:03 +08:00
  • 296d877d55 批量关注修改 苏尹岚 2020-01-08 10:20:50 +08:00
  • 48d8b3f772 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2020-01-08 10:03:19 +08:00
  • b22d880bde 同步错误 苏尹岚 2020-01-08 10:02:56 +08:00
  • 5fed851b8d 修改索引 苏尹岚 2020-01-08 09:47:09 +08:00
  • f5e8860b0a 删除事务,修改索引 苏尹岚 2020-01-08 09:46:05 +08:00
  • 743238b9ec 查询修改 苏尹岚 2020-01-08 09:28:45 +08:00
  • f7d89c8fe3 查询优化 苏尹岚 2020-01-08 09:25:08 +08:00
  • aa84f7ae31 根据skuID部分关注 苏尹岚 2020-01-08 09:15:20 +08:00
  • dc700da08d Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-08 09:09:53 +08:00
  • 4f4e6698e7 tongbu 苏尹岚 2020-01-08 09:09:32 +08:00
  • a47f7cd845 CreateAct.OverlapRulep gazebo 2020-01-07 18:30:22 +08:00
  • 8429a1e68a Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2020-01-07 18:26:12 +08:00
  • 28c75def4e 同步错误 苏尹岚 2020-01-07 18:26:01 +08:00
  • c6c2febfd1 同步错误 苏尹岚 2020-01-07 18:19:14 +08:00
  • e53df61baa 同步错误返回 苏尹岚 2020-01-07 18:02:14 +08:00
  • 86e783a4d0 错误返回 苏尹岚 2020-01-07 17:53:56 +08:00
  • 7183d58554 up gazebo 2020-01-07 15:21:52 +08:00
  • a69b5b3772 +Act.OverlapRule gazebo 2020-01-07 15:17:08 +08:00
  • e813e81ed8 同步错误 苏尹岚 2020-01-07 14:53:23 +08:00
  • 617b361fbe 同步错误 苏尹岚 2020-01-07 14:43:50 +08:00
  • 68c9f17d73 同步错误 苏尹岚 2020-01-07 14:37:24 +08:00
  • 26ca0bc01d 京西商城订单暂时不支持付款后取消 gazebo 2020-01-07 14:29:29 +08:00
  • 6c935643ae 同步错误 苏尹岚 2020-01-07 14:25:39 +08:00
  • 540209eadc 同步错误 苏尹岚 2020-01-07 14:20:56 +08:00
  • 5ad41fe621 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-07 13:38:35 +08:00
  • 8f8a8d304f BuyerCancelOrder gazebo 2020-01-07 13:36:08 +08:00
  • 386e6df25a Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2020-01-07 11:04:54 +08:00
  • a0d833d4ae 操作日志 苏尹岚 2020-01-07 11:03:07 +08:00
  • 16d2b0e3d2 Accept Merge Request #123: (yonghui -> mark) Merge Request: 推荐商品 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/123 苏尹岚 2020-01-07 10:31:28 +08:00
  • f05fa6302f 推荐商品 苏尹岚 2020-01-07 10:31:01 +08:00
  • 4ca6723fa2 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-07 10:30:04 +08:00
  • 11dd554561 BuyerCancelOrder gazebo 2020-01-07 10:29:51 +08:00
  • bba21e80a1 Accept Merge Request #122: (yonghui -> mark) Merge Request: 推荐商品 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/122 苏尹岚 2020-01-07 10:28:52 +08:00
  • 6d148fd0c8 推荐商品 苏尹岚 2020-01-07 10:28:01 +08:00
  • 47094be681 RegisterUser中,如果有AuthToken,忽略Token gazebo 2020-01-07 10:10:50 +08:00
  • 586644d0ec up gazebo 2020-01-07 10:01:24 +08:00
  • d913a8d68b up gazebo 2020-01-07 09:56:03 +08:00
  • 901b45690d fk gazebo 2020-01-07 09:50:47 +08:00
  • 4a394a60eb 美团UpdateStoreBoxFee中,忽略没有打包费配置错误 gazebo 2020-01-07 09:47:29 +08:00
  • 3fabb0d952 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-07 09:43:41 +08:00
  • c47a49cebd 修复饿百在设置门店状态后以上取状态状态没有变化导致的bug gazebo 2020-01-07 09:42:55 +08:00
  • c191436968 去掉验证token 苏尹岚 2020-01-07 09:02:35 +08:00
  • 33f2e2b74d 差评扣款 苏尹岚 2020-01-07 08:26:13 +08:00
  • 103bce68ba 差评补款 苏尹岚 2020-01-06 18:25:14 +08:00
  • 772c8f9cbe StoreSkuAct gazebo 2020-01-06 18:00:14 +08:00
  • e4b8d1da21 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-06 17:47:03 +08:00
  • c331ae3996 fk gazebo 2020-01-06 17:30:36 +08:00
  • c92996a1d9 up gazebo 2020-01-06 16:54:54 +08:00
  • 14b45ee277 畅销品 苏尹岚 2020-01-06 16:51:05 +08:00
  • 93c42824aa Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-06 16:37:52 +08:00
  • e0991f8609 畅销品查询 苏尹岚 2020-01-06 16:37:36 +08:00
  • 170cd63936 RegisterUser支持token gazebo 2020-01-06 16:36:52 +08:00
  • 54ad61d578 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-06 15:43:02 +08:00
  • f869a8e065 差评退款 苏尹岚 2020-01-06 15:42:47 +08:00
  • fda22fa2d4 SendVerifyCode gazebo 2020-01-06 15:36:33 +08:00
  • 483aa6df20 IsAdmin gazebo 2020-01-06 15:24:59 +08:00
  • ff0a3b3a02 显示中位价 苏尹岚 2020-01-06 14:26:00 +08:00
  • 5d21158c7b SendVerifyCode时,如果是管理员,返回verifyCode gazebo 2020-01-06 12:13:28 +08:00
  • 71ba2e13db 显示中位价 苏尹岚 2020-01-06 11:27:01 +08:00
  • 6f0a3bc971 显示中位价 苏尹岚 2020-01-06 11:11:37 +08:00
  • 3bd34ce8a5 显示中位价 苏尹岚 2020-01-06 11:08:16 +08:00
  • a5ea3ebd3d 显示中位价 苏尹岚 2020-01-06 10:51:54 +08:00
  • df6a0b1a1c 显示中位价 苏尹岚 2020-01-06 10:46:51 +08:00
  • 6fb43fa553 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-06 10:27:57 +08:00
  • a07209c86d 更新美团 cookie SyncStore2添加isManageIt gazebo 2020-01-06 10:21:54 +08:00
  • b80b83aaef Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-06 10:13:52 +08:00
  • 754c190220 增加中位价 苏尹岚 2020-01-06 10:13:31 +08:00
  • 152844a9f4 up gazebo 2020-01-06 09:39:34 +08:00
  • dd7d226b16 fix bug in GetStoresMapList2 gazebo 2020-01-06 09:30:10 +08:00
  • c47fc8e8e3 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-06 09:19:01 +08:00
  • 64cf14a04c 京东每晚同步不全同步 gazebo 2020-01-06 09:15:32 +08:00
  • f6b7c7cb0c Accept Merge Request #120: (yonghui -> mark) Merge Request: 价格处理 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/120 苏尹岚 2020-01-06 09:12:29 +08:00
  • 3164ee994e 启用门店打包费 gazebo 2020-01-06 09:11:20 +08:00
  • b8bdea90f3 冲突处理 苏尹岚 2020-01-06 08:54:48 +08:00
  • 36a46455ce 价格统计 苏尹岚 2020-01-06 08:51:24 +08:00
  • 13922ead60 京东活动重构,删除与添加时遇错继续 gazebo 2020-01-03 17:29:42 +08:00
  • e89af0849e CaculateSkuEarningPrice中调用ConstrainPayPercentage +RefreshOrdersPriceInfo gazebo 2020-01-03 15:56:02 +08:00
  • d7aa244528 jd act gazebo 2020-01-03 15:47:41 +08:00