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

Commit Graph

  • 97fe760ac5 - 同步平台商品时，如果修复一个不存在的SKU，要报错。删除成功后清除平台SKUID gazebo 2019-08-14 16:58:15 +08:00
  • 79925dd1de - fk gazebo 2019-08-14 16:51:06 +08:00
  • 47322fb302 - fk gazebo 2019-08-14 16:21:33 +08:00
  • 774b0a8965 - 切换主动微信小程序 gazebo 2019-08-14 15:26:06 +08:00
  • 8440c6dca5 - 门店商品相关表中去除饿了么的字段 gazebo 2019-08-14 14:49:12 +08:00
  • c63c43a92b - 准备处理平台价格字段 gazebo 2019-08-14 14:08:41 +08:00
  • d3ed741016 - up gazebo 2019-08-14 13:57:12 +08:00
  • bc6a5e9400 - 同步门店商品时，处理多门店平台SyncFlagModifiedMask标识的情况 gazebo 2019-08-14 13:54:37 +08:00
  • 5cd07db4bb Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark gazebo 2019-08-14 11:32:39 +08:00
  • f788eec5c1 - GetUsers支持分页 gazebo 2019-08-14 11:32:20 +08:00
  • 8dbeba87a1 Accept Merge Request #34: (don -> mark) Merge Request: 优化京西和平台商品差异对比的代码结构 Created By: @Nathan drake Accepted By: @Nathan drake URL: https://dev.tencent.com/u/XJH-Rosy/p/jx-callback/git/merge/34 Nathan drake 2019-08-14 11:32:10 +08:00
  • 80a82ea3a4 优化京西和平台商品差异对比的代码结构 Rosy-zhudan 2019-08-14 11:28:38 +08:00
  • 4c484a6280 - 去除无用代码，主要是promotion相关的 gazebo 2019-08-14 11:12:33 +08:00
  • 667e27d62e - up gazebo 2019-08-14 10:32:15 +08:00
  • 37ade34458 - getOrders中优化对时间字符的解析处理 gazebo 2019-08-14 10:15:28 +08:00
  • c48ebb4bd7 - GetOrders容错 gazebo 2019-08-14 10:04:54 +08:00
  • 03e23ca0fd - 修复之前将老平台同步逻辑注释掉引入的BUG gazebo 2019-08-14 00:20:35 +08:00
  • 18ad339e0c - AddStoreVendorMap同步失败后回滚本地数据 gazebo 2019-08-13 19:56:06 +08:00
  • f8a5e1bc8d - SyncFlagStoreSkuOnlyMask去掉SyncFlagStockMask gazebo 2019-08-13 18:34:03 +08:00
  • 1829156fba - 将老平台同步逻辑注释掉 gazebo 2019-08-13 18:09:12 +08:00
  • ad0c8eb3c0 + api_config.go gazebo 2019-08-13 17:57:03 +08:00
  • ff3cd0fa1b - GetRoleUserList中忽略ERR_NAME_NOT_FOUND错 gazebo 2019-08-13 16:40:40 +08:00
  • 05e6dbe6e1 - casbin model文件移到conf下 gazebo 2019-08-13 16:27:48 +08:00
  • e2867d6f67 Merge remote-tracking branch 'origin/don' into mark gazebo 2019-08-13 15:18:52 +08:00
  • 567046a238 - 在beta上启用EnableWXAuth2 gazebo 2019-08-13 14:59:19 +08:00
  • 06594330a5 不比较待创建且不可售的，京西有平台没有的商品 Rosy-zhudan 2019-08-13 14:53:14 +08:00
  • d4270bf8c3 - auth2也支持多小程序登录 gazebo 2019-08-13 11:49:42 +08:00
  • cd84cbdfd2 - auth2与auth在小程序登录成功后，如有必要刷新openID gazebo 2019-08-13 11:23:36 +08:00
  • d59ca265c4 - IAuther.UnbindAuth的接口改为userID gazebo 2019-08-13 11:02:14 +08:00
  • 37b931abe5 + OrderSkuFinancial.StoreSubID, StoreSubName gazebo 2019-08-13 10:27:29 +08:00
  • 91efe965d1 Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark gazebo 2019-08-13 09:35:29 +08:00
  • 55ab58df0f - 修复SaveOrderFinancialInfo中误删售后单的BUG gazebo 2019-08-13 09:34:51 +08:00
  • 505dc40559 ctx传参 Rosy-zhudan 2019-08-13 09:17:50 +08:00
  • 262cc9d4f3 Accept Merge Request #31: (don -> mark) Merge Request: 增加两列（待创建，待删除），不比较待创建且不可售的京西商品 Created By: @Nathan drake Accepted By: @Nathan drake URL: https://dev.tencent.com/u/XJH-Rosy/p/jx-callback/git/merge/31 Nathan drake 2019-08-12 18:28:51 +08:00
  • 90f6b8b82b 关闭写文件 Rosy-zhudan 2019-08-12 18:23:32 +08:00
  • 71bb175e45 增加两列（待创建，待删除），不比较待创建且不可售的京西商品 Rosy-zhudan 2019-08-12 18:18:03 +08:00
  • 6a8e3cb4b0 - 去除auth.localpass（已经移到auth2.localpass） gazebo 2019-08-12 17:56:50 +08:00
  • 339b60c374 + EnableWXAuth2 gazebo 2019-08-12 17:54:00 +08:00
  • c5a5f4777b - AdjustOrder与PartRefundOrder中，为了区别活动与非活动SKU，需转入SubStoreID（即单品的活动ID）区分 gazebo 2019-08-12 17:17:12 +08:00
  • 20362a4efe - auth中不管验证码是否发送失败都保存在cache中 gazebo 2019-08-12 15:03:47 +08:00
  • 342be58814 - 修复多小程序支持的BUG，从referer中得到小程序ID信息 gazebo 2019-08-12 14:42:55 +08:00
  • 9ab43f291e - 新旧小程序兼容BUG修复 gazebo 2019-08-12 14:15:11 +08:00
  • 4ec85bbb73 - RegisterUser在已经找到相应手机号用户的情况下，返回正式登录信息 gazebo 2019-08-12 10:59:01 +08:00
  • d90bc3cb11 - 兼容一个新的微信小程序 gazebo 2019-08-12 10:46:35 +08:00
  • fb2d8734f9 - 尝试处理京东售后SKU是非正品的情况 gazebo 2019-08-11 18:21:40 +08:00
  • a8115479eb - 调整每晚同步时间至8:30 gazebo 2019-08-10 08:43:43 +08:00
  • 15d270b075 - 同步商品库已下架商品时，设置删除日期 gazebo 2019-08-10 08:18:07 +08:00
  • 28124c18d4 - 晚上定时同步时强制同步价格与可售状态 gazebo 2019-08-09 18:35:29 +08:00
  • 64a4ceda62 Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark gazebo 2019-08-09 18:18:19 +08:00
  • 1111a70277 - 不过滤饿百目录名 gazebo 2019-08-09 18:17:57 +08:00
  • 2b530faaf6 Accept Merge Request #30: (don -> mark) Merge Request: 过滤已经同步过商品的门店，增加京西平台商品的同步状态列 Created By: @Nathan drake Accepted By: @Nathan drake URL: https://dev.tencent.com/u/XJH-Rosy/p/jx-callback/git/merge/30 Nathan drake 2019-08-09 18:16:15 +08:00
  • 32bd34e5c9 过滤已经同步过商品的门店，增加京西平台商品的同步状态列 Rosy-zhudan 2019-08-09 15:07:00 +08:00
  • 1f02ad823c Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark gazebo 2019-08-09 14:48:18 +08:00
  • 8a812e214b - GetStoresSkus必须指定storeIDs或skuIDs或分页 gazebo 2019-08-09 14:47:59 +08:00
  • 87f69c553f - 暂不支持删除银行 gazebo 2019-08-09 13:47:39 +08:00
  • 905928725a Accept Merge Request #29: (don -> mark) Merge Request: 修改一些BUG，代码重构 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/29 XJH-Rosy 2019-08-09 13:42:15 +08:00
  • 8be5e69016 修改一些BUG，代码重构 Rosy-zhudan 2019-08-09 12:03:20 +08:00
  • 6f403e909f - 修复GetStores中没有限制new_config未删除的bug gazebo 2019-08-09 11:59:38 +08:00
  • 8c6ed7949b - DeleteSkusFromAct排除结算类型 gazebo 2019-08-09 11:30:15 +08:00
  • d8f3b7f467 - 活动商品后台分页,GetActStoreSkuInfo分页，添加keyword gazebo 2019-08-09 11:19:43 +08:00
  • edff61d85c - GetStores中GROUP BY与字段不匹配的BUG修改 gazebo 2019-08-09 11:15:44 +08:00
  • 304f3fe86e - 启用DeleteSkusFromAct gazebo 2019-08-09 10:00:53 +08:00
  • 0e45ae3151 - up gazebo 2019-08-09 09:51:39 +08:00
  • 4d1c5a6704 - 调试DeleteSkusFromAct gazebo 2019-08-09 09:48:01 +08:00
  • 57b68f3155 - up gazebo 2019-08-09 09:38:28 +08:00
  • cf9ecaa3a9 Merge branch 'auth2' into mark gazebo 2019-08-09 09:33:27 +08:00
  • 7b652ed47c Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark gazebo 2019-08-09 09:33:18 +08:00
  • 35e06e8c94 + DeleteSkusFromAct gazebo 2019-08-09 09:33:01 +08:00
  • 721e78948f Accept Merge Request #28: (don -> mark) Merge Request: ctx外部传参 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/28 XJH-Rosy 2019-08-09 08:58:45 +08:00
  • 748a530108 ctx外部传参 Rosy-zhudan 2019-08-09 08:55:54 +08:00
  • 3541fada72 - fk gazebo 2019-08-08 22:42:46 +08:00
  • a06c4d471f Accept Merge Request #27: (don -> mark) Merge Request: 设置一些函数的父任务 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/27 XJH-Rosy 2019-08-08 18:13:28 +08:00
  • bd826a2b69 设置一些函数的父任务 Rosy-zhudan 2019-08-08 18:08:21 +08:00
  • 6def20bc4e Accept Merge Request #26: (don -> mark) Merge Request: 重构京西和平台商品对比的代码 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/26 XJH-Rosy 2019-08-08 17:59:28 +08:00
  • bc896e98e5 并发任务加入到管理 Rosy-zhudan 2019-08-08 17:56:45 +08:00
  • b163fe4d5d Merge branch 'mark' into auth2 gazebo 2019-08-08 17:52:47 +08:00
  • 3c39a2df22 - RefreshDingDingToken在beta上打开 gazebo 2019-08-08 17:52:07 +08:00
  • af88e9c52e - ren AuthInfo.ExpiresIn to ExpiresAt - 将auth2中不是小驼峰的全部修改 gazebo 2019-08-08 17:14:45 +08:00
  • b51614946f - 重构authz结构 - 角色管理初版完成 gazebo 2019-08-08 17:06:58 +08:00
  • fcb04c7f52 使用当前已有的平台名字定义 Rosy-zhudan 2019-08-08 16:42:57 +08:00
  • e378affcf1 重构代码 Rosy-zhudan 2019-08-08 16:20:19 +08:00
  • 60f3ec9c3b + Store添加MarketManRole与OperatorRole - GetStoreListByMobileOrStoreIDs支持按Store.MarketManRole与OperatorRole来得到门店列表 gazebo 2019-08-08 15:46:32 +08:00
  • 03dd787375 - up gazebo 2019-08-08 15:12:11 +08:00
  • 50c5a52d6b Accept Merge Request #25: (don -> mark) Merge Request: 修改库存刷新机制-美团和饿百分时刷新 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/25 XJH-Rosy 2019-08-08 15:06:51 +08:00
  • 17b91e4ee7 - 根据已经部分关注的商品，得到已经存在的门店商品单价 gazebo 2019-08-08 14:57:26 +08:00
  • 94f9a07519 重构代码 Rosy-zhudan 2019-08-08 12:03:25 +08:00
  • 8db2827a03 - up gazebo 2019-08-08 11:44:17 +08:00
  • 1338877972 - weixin to wxqrcode gazebo 2019-08-08 10:59:41 +08:00
  • 20abf31150 - 添加黑名单与转自送提示 gazebo 2019-08-08 09:34:00 +08:00
  • df40806734 去掉注释代码 Rosy-zhudan 2019-08-08 09:26:55 +08:00
  • 4facbdbbfd Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-08 09:14:21 +08:00
  • fb7c59b38e - SyncFlagSpecMask从32改为64 - 添加SyncFlagStockMask为32 - 修复新关注商品在同步至多门店平台时，同步出错时可能的清同步标识不正确的问题 gazebo 2019-08-07 23:47:27 +08:00
  • 7b488090bc - rename AuthTypeWeixin from weixin to wxqrcode gazebo 2019-08-07 18:45:47 +08:00
  • 70c9862403 - fix bug in weixin.VerifySecret gazebo 2019-08-07 18:34:36 +08:00
  • 76495b51ee - beta添加getWeixinTokenURL gazebo 2019-08-07 18:22:13 +08:00
  • 3639a1c7cb - 角色管理初版 gazebo 2019-08-07 18:16:44 +08:00
  • 059be1befd - 修复同步逻辑中，多门店平台关注商品时同步的BUG（需要同时改可售，价格信息） gazebo 2019-08-07 16:39:21 +08:00
  • 33c642fbc4 - 在转自送失败后不设置OrderDeliveryFlagMaskScheduleDisabled标志 gazebo 2019-08-07 16:22:15 +08:00
  • fdd6d0f462 解决冲突，合并提交 Rosy-zhudan 2019-08-07 15:24:35 +08:00
  • 877566cc80 修改库存刷新机制-美团和饿百分时刷新 Rosy-zhudan 2019-08-07 15:19:29 +08:00