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

Commit Graph

  • fbfe4037bc up gazebo 2019-11-25 11:04:57 +08:00
  • ab445a8edf addOrderStatusk,美团在订单完成后，还可能收到订单取消（应该当成售后单处理才合适），强制忽略这种情况，比如订单：80662201436073600 gazebo 2019-11-25 10:55:50 +08:00
  • aadbb087d2 美团外卖全额售后单创建时，不再依赖于OrderFinancialDetail2Refund gazebo 2019-11-25 10:30:53 +08:00
  • 143db222e1 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-24 08:33:50 +08:00
  • bb602a14d4 美团商品强制设置5张图 gazebo 2019-11-24 08:32:45 +08:00
  • 42e348e59a 准备重构订单调度定时器 gazebo 2019-11-23 15:36:17 +08:00
  • c033fd3988 Accept Merge Request #35: (yonghui -> mark) Merge Request: excel Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/35 苏尹岚 2019-11-22 19:11:00 +08:00
  • 228071d00e excel 苏尹岚 2019-11-22 19:10:36 +08:00
  • 88b84ef014 Accept Merge Request #34: (yonghui -> mark) Merge Request: 永辉excel Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/34 苏尹岚 2019-11-22 19:09:36 +08:00
  • ae6ad69d8c yonghuiexcel 苏尹岚 2019-11-22 19:08:48 +08:00
  • 78a26364c0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-22 18:33:02 +08:00
  • 5d2e9be549 创建活动时，OriginalPrice返回京西价 gazebo 2019-11-22 18:32:31 +08:00
  • ec494368a4 Accept Merge Request #33: (yonghui -> mark) Merge Request: 修改永辉Excel接口修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/33 苏尹岚 2019-11-22 18:03:39 +08:00
  • 70bf3a70a9 永辉Excel接口修改 苏尹岚 2019-11-22 18:03:12 +08:00
  • 92b9f96889 读取永辉Excel接口修改 苏尹岚 2019-11-22 17:59:48 +08:00
  • aaf9e9a183 取消生成美团店的假商品 gazebo 2019-11-22 17:34:00 +08:00
  • 27a573bd30 specialStoreID = "8171010" gazebo 2019-11-22 17:13:41 +08:00
  • 0fef41b956 up gazebo 2019-11-22 17:09:25 +08:00
  • 90092058a2 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-22 17:06:01 +08:00
  • 251894e2d2 up gazebo 2019-11-22 17:05:50 +08:00
  • ab3741ae2b Accept Merge Request #32: (yonghui -> mark) Merge Request: 读取永辉Excel修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/32 苏尹岚 2019-11-22 17:00:06 +08:00
  • aa5a8bacc0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-22 17:00:10 +08:00
  • 4a6ada20c4 临时测试温江直营店SKU与图片自动加多 gazebo 2019-11-22 16:59:32 +08:00
  • 34759f564b 读取永辉Excel修改 苏尹岚 2019-11-22 16:59:31 +08:00
  • 3540f359b0 Accept Merge Request #31: (yonghui -> mark) Merge Request: 读取永辉excel修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/31 苏尹岚 2019-11-22 16:50:45 +08:00
  • edd32038eb 读取永辉excel 苏尹岚 2019-11-22 16:49:52 +08:00
  • f7144ecde1 GetStoresSkus返回商品可售时段 gazebo 2019-11-22 16:39:29 +08:00
  • 01f872a36d Accept Merge Request #30: (yonghui -> mark) Merge Request: 永辉excel新需求完善 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/30 苏尹岚 2019-11-22 16:15:33 +08:00
  • 15757c6f30 读取永辉Excel新需求完善 苏尹岚 2019-11-22 16:06:13 +08:00
  • 61eb7d0546 ShouldSetTimer结构优化 gazebo 2019-11-22 14:37:21 +08:00
  • 36403a3797 fk gazebo 2019-11-22 10:52:42 +08:00
  • 3a032c18cd 直营店始终按比例结算 gazebo 2019-11-21 18:14:55 +08:00
  • 9dda86169b 美团订单完全忽略运单定时器 gazebo 2019-11-21 17:42:24 +08:00
  • ce76490526 读取永辉Excel测试 苏尹岚 2019-11-21 17:28:11 +08:00
  • b78012d82b 每隔10天要强刷门店商品可售状态 gazebo 2019-11-21 17:27:13 +08:00
  • 0f0fd28f26 晚上只强刷价格 gazebo 2019-11-21 15:56:47 +08:00
  • 3edc4b0e37 syncStoreSkuNew中强制出错继续 gazebo 2019-11-21 15:38:49 +08:00
  • bd8100d3c2 openTimeMtwm2JX中防止越界 gazebo 2019-11-21 15:28:22 +08:00
  • 8618dfc297 永辉excel接口测试 苏尹岚 2019-11-21 13:58:17 +08:00
  • 53d9c30dfa 时间范围修改 苏尹岚 2019-11-21 13:48:10 +08:00
  • 679c4db0f2 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into su 苏尹岚 2019-11-21 13:36:43 +08:00
  • 640b8203a8 错误返回 苏尹岚 2019-11-21 13:31:29 +08:00
  • 0416712318 去除临时通过门店账单上传永辉的代码 gazebo 2019-11-21 11:52:43 +08:00
  • 73ad219db3 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-21 11:49:01 +08:00
  • e2d34ea4bd 读取永辉excel文件 苏尹岚 2019-11-21 11:48:21 +08:00
  • 81249ae3b7 京东活动即使创建失败，也记录平台活动ID 删除活动商品时，如果之前是同步失败状态，不调用SyncAct gazebo 2019-11-21 11:40:35 +08:00
  • 603c6bffa2 auth2.Login中，暂时禁用利用得到受信任的信息查找用户 gazebo 2019-11-21 10:40:21 +08:00
  • 7c5e411f8b +微信支付证书 gazebo 2019-11-21 09:48:26 +08:00
  • db9e80212f 微信支付退款 gazebo 2019-11-21 09:20:56 +08:00
  • e6460c7756 错误返回 苏尹岚 2019-11-21 08:35:59 +08:00
  • 75caa1fffd 处理UpdateStore时，传入autoEnableAt引起的crash gazebo 2019-11-20 22:00:22 +08:00
  • 605ca94ccf 读取永辉excel 苏尹岚 2019-11-20 19:35:40 +08:00
  • e60ce73799 读取永辉excel 苏尹岚 2019-11-20 19:24:51 +08:00
  • 7738590cbe Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-20 16:08:10 +08:00
  • 358e3eea1e Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-11-20 16:04:29 +08:00
  • a71d4be51a jd.getStrOutSkuIDs中，因应StoreSkuBatchUpdateResponse.Code改为string gazebo 2019-11-20 16:03:37 +08:00
  • 1195e194a1 +Pay4Order gazebo 2019-11-20 15:55:09 +08:00
  • 1898d2932a 同步错误返回 苏尹岚 2019-11-20 13:36:38 +08:00
  • 54778bc013 同步错误返回 苏尹岚 2019-11-20 10:56:11 +08:00
  • 52ae9085e3 同步错误返回 苏尹岚 2019-11-20 10:55:23 +08:00
  • 8fc161709d 同步错误返回 苏尹岚 2019-11-20 10:52:36 +08:00
  • 82ac23ab0a 同步返回错误 苏尹岚 2019-11-20 10:49:19 +08:00
  • 0e481ffe72 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-20 09:55:42 +08:00
  • b6dced6a3c 时间校验 苏尹岚 2019-11-20 09:55:30 +08:00
  • ea49b20528 InitVendorCategory中改用批量插入 gazebo 2019-11-20 09:41:00 +08:00
  • 61570289a2 创建活动折扣检查失败时，返回平台价 gazebo 2019-11-20 09:12:27 +08:00
  • 56869ef22a +StoreSkuNamesInfo添加actType gazebo 2019-11-19 16:06:56 +08:00
  • 15020a0c9f 修复GetPricePercentage中的bug gazebo 2019-11-19 16:02:25 +08:00
  • 34047548ed 时间校验 苏尹岚 2019-11-19 15:55:20 +08:00
  • 70b3f21ad8 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-19 10:42:44 +08:00
  • cee40f9a92 修复getAppFoodCodeList没有真正实现的bug. gazebo 2019-11-19 10:39:30 +08:00
  • a939076b8b 下架微盟商品 苏尹岚 2019-11-19 08:56:38 +08:00
  • 5b66fdfaa4 读取永辉excel 苏尹岚 2019-11-18 19:07:38 +08:00
  • 4dfe0dc64f 读取永辉excel 苏尹岚 2019-11-18 19:01:12 +08:00
  • 469332db88 读取永辉excel 苏尹岚 2019-11-18 18:40:57 +08:00
  • 07e9f29e5a 读取永辉excel 苏尹岚 2019-11-18 18:19:59 +08:00
  • 2569172477 读取永辉excel 苏尹岚 2019-11-18 17:52:47 +08:00
  • 4710055072 读取永辉excel 苏尹岚 2019-11-18 17:46:02 +08:00
  • 4a460c0bc8 读取永辉excel 苏尹岚 2019-11-18 17:37:54 +08:00
  • 98988e2610 读取永辉excel 苏尹岚 2019-11-18 17:30:37 +08:00
  • ac8222c6e1 读取永辉excel 苏尹岚 2019-11-18 17:26:20 +08:00
  • bfb3aa5b0e 读取永辉excel 苏尹岚 2019-11-18 17:14:07 +08:00
  • 74dfe66326 读取永辉excel 苏尹岚 2019-11-18 16:56:18 +08:00
  • bd665daa8e 更新门店营业时间 苏尹岚 2019-11-18 16:23:08 +08:00
  • 9acd28873d 更新门店营业时间 苏尹岚 2019-11-18 16:21:11 +08:00
  • 4e3f9938dd 更新门店营业时间 苏尹岚 2019-11-18 16:18:19 +08:00
  • c8e1ccb37e 更新门店营业时间 苏尹岚 2019-11-18 16:12:46 +08:00
  • ba6439b752 定时商品可售时间 苏尹岚 2019-11-18 15:11:45 +08:00
  • 2a3a65ff44 时间校验修改 苏尹岚 2019-11-18 14:44:34 +08:00
  • ebe4319ab0 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-18 14:42:07 +08:00
  • a1e834a0bc 时间校验修改 苏尹岚 2019-11-18 14:41:56 +08:00
  • 9b12510cca jd.UpdateStore中，修改门店信息出错后，也要尝试修改免运包 gazebo 2019-11-18 11:52:19 +08:00
  • 07f33ccfe6 ChangeStoreSkuSaleStatus调用时要判断之前是否成功 gazebo 2019-11-18 11:33:01 +08:00
  • 8db8cfa6bc comment gazebo 2019-11-18 11:19:05 +08:00
  • 15a913dc0a 永辉excel 苏尹岚 2019-11-18 11:08:51 +08:00
  • 528f58ce4e 修改refutil 苏尹岚 2019-11-18 10:11:18 +08:00
  • 0c6393ba05 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-18 10:03:09 +08:00
  • 9b0a6f2150 美团订单即使时在配送状态时，如果之前没有调用过拣货完成，也会对门店指标生成影响，这里强制再调用拣货完成，且忽略错误 gazebo 2019-11-18 09:59:20 +08:00
  • 398f614a57 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2019-11-18 09:38:08 +08:00
  • b31adda4d5 商品可售时间设置校验 苏尹岚 2019-11-18 09:37:52 +08:00