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

Commit Graph

  • 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
  • 334c012818 获取京东门店等级 苏尹岚 2019-12-13 16:38:18 +08:00
  • 5a37a9cf28 up gazebo 2019-12-13 16:22:22 +08:00
  • e0263c619c Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-13 15:21:09 +08:00
  • d20d98816e +GenFakeUPC gazebo 2019-12-13 15:18:06 +08:00
  • a6925cfb70 修复getStoreDetail没有得到vendorOrgCode的bug gazebo 2019-12-13 12:04:18 +08:00
  • 5240bbe47f Accept Merge Request #82: (yonghui -> mark) Merge Request: 推荐商品分类sql修改，门店价格统计等修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/82 苏尹岚 2019-12-13 11:34:38 +08:00
  • 44653932ae 推荐商品，分类sql修改 苏尹岚 2019-12-13 11:33:13 +08:00
  • 91e5bf3939 fk gazebo 2019-12-13 11:09:28 +08:00
  • c8f53121e0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-13 11:02:04 +08:00
  • 00c565777a up gazebo 2019-12-13 11:01:44 +08:00
  • b7ca827ca7 去除getAPI("")调用，没有vendorOrgCode时报警 gazebo 2019-12-13 10:59:21 +08:00
  • 147a683177 门店价格修改 苏尹岚 2019-12-13 10:49:29 +08:00
  • 2ddd16460a GetSkusWithVendor中取商品城市的bug修复 gazebo 2019-12-13 10:47:58 +08:00
  • 8278de023d 同步错误返回冲突解决 苏尹岚 2019-12-12 18:32:46 +08:00
  • 9717defad6 修改结算信息权限增加 苏尹岚 2019-12-12 18:26:59 +08:00
  • a3cbbd46c6 同步错误返回冲突解决 苏尹岚 2019-12-12 18:21:47 +08:00
  • 23249077cf 同步错误返回解决冲突 苏尹岚 2019-12-12 18:10:13 +08:00
  • f6baae63ee Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-12 18:02:30 +08:00
  • 2915c41fc3 去除BaseTask.run中的recover gazebo 2019-12-12 18:02:10 +08:00
  • 2116d5d812 Accept Merge Request #80: (yonghui -> mark) Merge Request: 根据Excel修改京西价修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/80 苏尹岚 2019-12-12 17:44:30 +08:00
  • 2a090b473d 根据Excel更新京西价修改 苏尹岚 2019-12-12 17:43:09 +08:00
  • 67a48b515e Accept Merge Request #79: (yonghui -> mark) Merge Request: 刷新历史订单结算价返回值修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/79 苏尹岚 2019-12-12 17:35:38 +08:00
  • 4bf7105cab 刷新历史订单结算价修改 苏尹岚 2019-12-12 17:32:55 +08:00
  • f156cfcd1d up gazebo 2019-12-12 17:13:49 +08:00
  • 2bf513f4be sync2中没有正确使用vendorIDs与appOrgCodes的bug修复 gazebo 2019-12-12 17:03:14 +08:00
  • a0c5949b3f 根据Excel更新京西价 苏尹岚 2019-12-12 16:49:45 +08:00
  • 690453cd73 根据Excel更新京西价，修改异步任务中返回值 苏尹岚 2019-12-12 16:25:27 +08:00
  • e918d834ec RefreshHistoryOrdersEarningPrice中不正确返回retVal给ParallelTask的问题修复 gazebo 2019-12-12 16:16:02 +08:00
  • 54de6440b7 fk gazebo 2019-12-12 16:03:54 +08:00
  • 8f27fb920b Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-12 16:00:12 +08:00
  • 4d15303149 处理创建分类是的父子关系 gazebo 2019-12-12 15:53:17 +08:00
  • 1fc9037f0f Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-12 15:39:03 +08:00
  • 7468b67542 根据Excel更新京西价 苏尹岚 2019-12-12 15:38:45 +08:00
  • 099ba06d04 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-12 15:02:17 +08:00
  • 231aac93a8 SyncSkus与SyncCategories错误继续 gazebo 2019-12-12 15:01:01 +08:00
  • 99da2e9824 根据excel更新京西价 苏尹岚 2019-12-12 14:40:20 +08:00
  • dd58517099 京东api修改 苏尹岚 2019-12-12 14:17:07 +08:00
  • 24a47c7649 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-12 13:38:38 +08:00
  • 19704b74bc 错误提示，门店评分修改 苏尹岚 2019-12-12 13:38:06 +08:00
  • e94cd01982 京西菜市启用349454 gazebo 2019-12-12 12:49:35 +08:00
  • b21d652149 +djsw.UpdateSku gazebo 2019-12-12 12:02:15 +08:00
  • a9f18ab056 去除JdStoreInfoCoordinateRecover中对于JdAPI的直接依赖 gazebo 2019-12-12 11:41:02 +08:00
  • 96dd367d65 GetStoresSkusNew获取正确的京东平台vendorSkuID gazebo 2019-12-12 11:15:52 +08:00
  • 248a9299ce GetSkusWithVendor,GetSkuCategoryWithVendor apimanager的bug修改 gazebo 2019-12-12 10:59:55 +08:00
  • ccc0d3dfda updateThingMapEntity gazebo 2019-12-12 10:02:37 +08:00
  • d8c77cfb6e up gazebo 2019-12-12 09:32:36 +08:00
  • ce9b0f2661 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-12 09:19:44 +08:00
  • 29bc986e45 jd2配置 SyncSkuNames SyncCategorys gazebo 2019-12-12 09:18:44 +08:00
  • 53d4b6e987 Accept Merge Request #76: (yonghui -> mark) Merge Request: 新增可修改结算信息权限人员 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/76 苏尹岚 2019-12-12 08:19:45 +08:00
  • 4a4342def0 新增可修改结算信息权限人员 苏尹岚 2019-12-12 08:17:42 +08:00
  • 2168cf9731 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-11 22:31:07 +08:00
  • db85de7454 +FullSyncVendorStuff gazebo 2019-12-11 22:30:32 +08:00
  • 8d93079655 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2019-12-11 18:12:33 +08:00
  • d08b64d1d9 分类状态和分类图片 苏尹岚 2019-12-11 18:12:09 +08:00
  • 2156c77dbf UploadImg添加vendorOrgCode参数 gazebo 2019-12-11 17:42:56 +08:00
  • bc10962095 修复GetActStoreSkuVendorList中sqlParams的错误 gazebo 2019-12-11 17:29:33 +08:00
  • 592ed3c252 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-12-11 16:55:05 +08:00
  • 118ad50abd store_sku_check对于vendorOrgCode的正确依赖 gazebo 2019-12-11 16:27:10 +08:00