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

Commit Graph

  • af5947288d - 修复TransferLegacyWeixins中删除角色的BUG gazebo 2019-08-27 14:36:18 +08:00
  • 702713933d - 调整TransferLegacyWeixins的调用时机，只在UnbindMobile与BindMobile2调用 gazebo 2019-08-27 14:27:58 +08:00
  • e19d5be608 ! 全部启用EnableWXAuth2 gazebo 2019-08-27 10:13:07 +08:00
  • f2972580d1 + TransferLegacyWeixins gazebo 2019-08-27 10:10:43 +08:00
  • 645567c7ea Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark gazebo 2019-08-27 10:01:17 +08:00
  • 7dfa59e6e0 - 区分菜市与果园的调试端口 gazebo 2019-08-27 10:00:40 +08:00
  • b25545b9f0 Accept Merge Request #39: (don -> mark) Merge Request: 测试PPROF Created By: @Nathan drake Accepted By: @Nathan drake URL: https://dev.tencent.com/u/XJH-Rosy/p/jx-callback/git/merge/39 Nathan drake 2019-08-27 09:30:09 +08:00
  • 311f39d5ae 去掉调试代码 Rosy-zhudan 2019-08-27 09:18:19 +08:00
  • 42618f729a Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-27 09:08:47 +08:00
  • e0fdd2055c - 添加pprof启动代码 gazebo 2019-08-27 09:06:30 +08:00
  • fc9e032096 加SLEEP测试 Rosy-zhudan 2019-08-27 09:03:35 +08:00
  • 092281e8bd Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-27 08:29:29 +08:00
  • 0eaa99bb62 - GetStores中转换至百度坐标OK gazebo 2019-08-26 18:53:12 +08:00
  • b1d7cb8f18 - fk gazebo 2019-08-26 18:37:53 +08:00
  • 73fbb43157 打开调试PPROF Rosy-zhudan 2019-08-26 17:48:50 +08:00
  • 139d3fec0f - fk gazebo 2019-08-26 17:47:40 +08:00
  • 69cd849bbd 关闭PPROF Rosy-zhudan 2019-08-26 17:46:15 +08:00
  • ec612b807b - fk gazebo 2019-08-26 17:31:56 +08:00
  • 43ae1c2efa 测试pprof Rosy-zhudan 2019-08-26 17:30:35 +08:00
  • a39a4b7917 - UpdateStore中调用updateCourierStores时的判断逻辑修改 gazebo 2019-08-26 16:57:02 +08:00
  • 7bd415c21f - up gazebo 2019-08-26 16:01:12 +08:00
  • 20c63e7f59 - auth1与auth2以为是兼容 gazebo 2019-08-26 15:16:05 +08:00
  • fcc87c34af - TransferLegacyWeixins中采用增量式 gazebo 2019-08-26 11:44:47 +08:00
  • ea97ad1a6c Accept Merge Request #38: (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/38 Nathan drake 2019-08-25 10:12:19 +08:00
  • 949d4e7c8d 重构-开启或结束所有平台商店的额外时间 Rosy-zhudan 2019-08-25 10:05:37 +08:00
  • 881198d0f1 - GetStores添加provinceCode gazebo 2019-08-22 19:19:01 +08:00
  • 6b06041140 - 将每晚定时刷的任务拆分成京东与非京东 gazebo 2019-08-21 22:09:44 +08:00
  • 966646f953 - 去掉GetStores的坐标转（转换至百度坐标要百度API，高德不行） gazebo 2019-08-21 21:28:23 +08:00
  • 2be1c7b71d - GetStores添加参数:startStoreID, coordinateType。返回值添加provinceName省名 gazebo 2019-08-21 18:21:07 +08:00
  • 2769f18ab4 + OperationTime2StrWithSecond gazebo 2019-08-21 17:38:06 +08:00
  • cdc5ec75b3 + ScheduleTimerFuncOnce gazebo 2019-08-21 17:22:02 +08:00
  • 5e94bf4dbd - fk gazebo 2019-08-21 16:42:36 +08:00
  • e626d4242f - fk gazebo 2019-08-21 16:34:49 +08:00
  • 8e284beba0 + StoreMap添加FakeOpenStart和FakeOpenStop gazebo 2019-08-21 16:28:57 +08:00
  • c35df3a5a4 - 同步门店商品时，修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改 gazebo 2019-08-21 15:35:13 +08:00
  • 9b8173d0f7 - 修改getGetStoresSkusBaseSQL中查询导常商品的逻辑 gazebo 2019-08-21 14:17:02 +08:00
  • c0339d245a - 修复GetSingleStoreVendorIDs的bug gazebo 2019-08-21 11:53:41 +08:00
  • 2ca7e5accc - 处理微商城订单中的SKU没有商家自编码的情况 gazebo 2019-08-21 11:24:42 +08:00
  • c5f859c92e - auth2添加固定TOKEN gazebo 2019-08-21 09:17:28 +08:00
  • bf3e825f11 - SyncStoresSkus2中，当setSyncStatus不为0时，在要处理相应门店时，才设置相应标志（之前是一开始全部设置标志） gazebo 2019-08-21 08:34:32 +08:00
  • 360844863c Accept Merge Request #37: (don -> mark) Merge Request: 把京西有，平台无且没有待创建标记的商品加上待创建标记 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/37 XJH-Rosy 2019-08-20 17:20:28 +08:00
  • 55a1ec6ff5 得到敏感词列表 Rosy-zhudan 2019-08-20 17:16:47 +08:00
  • faef402cbb 修改-把京西有，平台无且没有待创建标记的商品加上待创建标记 Rosy-zhudan 2019-08-20 16:50:09 +08:00
  • 212800934f 把京西有，平台无且没有待创建标记的商品加上待创建标记 Rosy-zhudan 2019-08-20 15:56:24 +08:00
  • 3780f5c62e - 用户添加角色时，判断用户类型 gazebo 2019-08-20 15:36:49 +08:00
  • 73a26e0d36 - GetStoresOrderSaleInfoNew gazebo 2019-08-20 15:00:29 +08:00
  • 71dec1ed4c - up gazebo 2019-08-20 14:50:33 +08:00
  • 927a5059ed - fk gazebo 2019-08-20 14:42:24 +08:00
  • 1a54bdd91d - up gazebo 2019-08-20 14:24:44 +08:00
  • 6bd473839c - 修复GetStoresOrderSaleInfoNew中的bug gazebo 2019-08-20 14:07:31 +08:00
  • bcd8eba95e - fix bug in GetStoresOrderSaleInfoNew gazebo 2019-08-20 12:09:02 +08:00
  • 467bb42e13 - UpdatStore时，如果是外卖管理，忽略printerKey gazebo 2019-08-20 11:43:09 +08:00
  • fa3d022750 Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark gazebo 2019-08-20 11:00:24 +08:00
  • 7a91faec5b + GetStoresOrderSaleInfoNew gazebo 2019-08-20 10:59:47 +08:00
  • 73b62ca1a9 - comment gazebo 2019-08-20 08:40:58 +08:00
  • 81845d2ed6 Accept Merge Request #36: (don -> mark) Merge Request: 增加打印大字体的功能 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/36 XJH-Rosy 2019-08-20 08:26:30 +08:00
  • 3b38645c71 - act.SyncAct中，当前逻辑要求传入活动的全部SKU信息（以便低层做一些判断，比如全部删除时要取消，所以暂时删除storeIDs与skuIDs这两个参数 gazebo 2019-08-19 18:58:08 +08:00
  • 10da91668f 增加打印大字体的功能 Rosy-zhudan 2019-08-19 18:09:03 +08:00
  • 9c825058c8 - up gazebo 2019-08-19 17:43:35 +08:00
  • 59f07b567a - fk gazebo 2019-08-19 16:57:21 +08:00
  • 7317b5660c - 添加30888到每晚同步忽略列表 gazebo 2019-08-19 16:41:58 +08:00
  • 80ba7c9759 - 修复ebai.getVendorCategories中的bug gazebo 2019-08-19 15:34:58 +08:00
  • 6801e17fc9 - 避免饿百网页上拉下来的活动重名 gazebo 2019-08-19 14:12:25 +08:00
  • 7653f5ff5a Accept Merge Request #35: (don -> mark) Merge Request: 敏感词过滤 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/35 XJH-Rosy 2019-08-19 11:27:08 +08:00
  • 9773900d34 敏感词修改代码结构 Rosy-zhudan 2019-08-19 11:22:30 +08:00
  • 793a9a135a Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-19 11:13:57 +08:00
  • e52718ca2d - 更新beta京东的token gazebo 2019-08-19 11:02:02 +08:00
  • a1397d11f9 + feie_test.go gazebo 2019-08-19 11:00:25 +08:00
  • 6b792f94cf - up gazebo 2019-08-19 10:43:36 +08:00
  • 5c124f5c8f Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-19 10:36:25 +08:00
  • 95ad39fd49 - GetStores添加 t1.market_man_role, t1.operator_role, t1.operator_role2, t1.printer_font_size, gazebo 2019-08-19 10:28:43 +08:00
  • dee9eea64a 修改敏感词过滤代码结构 Rosy-zhudan 2019-08-19 10:27:04 +08:00
  • ba94bb061b - AddStoreBossByMoble添加调试 gazebo 2019-08-19 10:17:47 +08:00
  • d7b38e196e + AddStoreBossByMoble gazebo 2019-08-19 10:04:25 +08:00
  • 1f2c9ae48f + Store添加OperatorRole2，Store.PrinterFontSize gazebo 2019-08-19 09:40:27 +08:00
  • 9425f3c07a Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-19 08:33:05 +08:00
  • 93a3022925 - 更新京东与饿百网页cookie gazebo 2019-08-18 14:06:49 +08:00
  • 68d7b107f7 - 限制ConsigneeName长度 gazebo 2019-08-17 16:23:51 +08:00
  • 882a7c60ad - 修复添加excludeSkuIDs引入的同步bug gazebo 2019-08-17 11:16:21 +08:00
  • e7acd75c25 - SyncQualify中错误添加门店信息 gazebo 2019-08-16 21:08:18 +08:00
  • 353b187edb 京西和平台商品对比-加入数据分析Sheet Rosy-zhudan 2019-08-16 18:34:21 +08:00
  • 33e4b7e329 - up gazebo 2019-08-16 17:51:32 +08:00
  • 60d5940f3e - GetStores时keyword查询证照相关的信息 gazebo 2019-08-16 17:49:52 +08:00
  • 8ea31c1967 - 修复计算GoodsOrder.EarningPrice的bug. gazebo 2019-08-16 17:41:15 +08:00
  • 79533bed09 - 同步相关操作添加excludeSkuIDs参数 gazebo 2019-08-16 15:06:20 +08:00
  • 9b09fc9cae Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-16 14:29:07 +08:00
  • 4636ea7fd5 敏感词过滤 Rosy-zhudan 2019-08-16 14:26:22 +08:00
  • c27d610fbb - 整理sync.go gazebo 2019-08-16 14:12:11 +08:00
  • 9a5bde9d09 - 修复getOrders按城市查询的BUG gazebo 2019-08-16 11:26:58 +08:00
  • 14e3594455 - GetStoresOrderSaleInfo添加售后单信息 gazebo 2019-08-16 11:08:09 +08:00
  • b36f8b3ae1 - UpdateStoresSkusSale中对于autoSaleAt按服务器设置处理，不管客户端传的具体值 gazebo 2019-08-15 18:43:55 +08:00
  • 5e6c087ba2 - jd.SyncQualify调整 gazebo 2019-08-15 17:14:23 +08:00
  • f92ff76b61 - 添加alpha的京东网页cookie gazebo 2019-08-15 16:47:55 +08:00
  • 89ee6b5006 - SyncQualify中根据Store.LicenceType来判断是否是个人 gazebo 2019-08-15 16:41:05 +08:00
  • 7aa548e1dc - 京东到家资质相关的日期格式修复 gazebo 2019-08-15 16:29:26 +08:00
  • dd201a58fb - up gazebo 2019-08-15 15:50:13 +08:00
  • 26484d45e3 - jd.SyncQualify改为提交 gazebo 2019-08-15 15:38:59 +08:00
  • 3c5f25b839 + SyncStoresQualify gazebo 2019-08-15 12:40:14 +08:00
  • c607fa931c + JdPageAPI gazebo 2019-08-15 08:56:02 +08:00
  • 634ac5ebe6 + StoreSkuBind添加JdPrice, EbaiPrice, MtwmPrice和WscPrice gazebo 2019-08-14 17:31:17 +08:00