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

Commit Graph

  • 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
  • e64e0cc4fb 给数据加锁 Rosy-zhudan 2019-08-07 15:18:10 +08:00
  • f06456cec1 - 用SyncMapWithTimeout管理tasksch任务 gazebo 2019-08-07 14:55:54 +08:00
  • 8768fe8236 - FreeBatchStoreSkuInfo与FreeBatchStoreSkuSyncInfo添加任务名 gazebo 2019-08-07 14:15:30 +08:00
  • cef5be3e06 - GetUsers过滤掉离职人员信息 gazebo 2019-08-07 11:35:46 +08:00
  • 638d851872 - 避免在美团分类别没有实际变化时修改报错 gazebo 2019-08-07 10:04:42 +08:00
  • b1209a954b - 修改门店状态同步逻辑，只有在京西本地修改过门店状态相关的信息后才同步 gazebo 2019-08-07 09:52:35 +08:00
  • f5208eea28 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-07 09:06:50 +08:00
  • e3e900cd10 - 门店网络打印机设置修改，只有在成功绑定后才执行可能的解绑（之前是先解绑，可能有问题） - 所有网络打印机适配层写入性API添加EnableStoreWrite控制 gazebo 2019-08-06 21:58:06 +08:00
  • 447237f252 - fix bug in GetUsers gazebo 2019-08-06 17:01:51 +08:00
  • a0c74cf02a - GetUsers接口改变 gazebo 2019-08-06 16:35:37 +08:00
  • d5d35274dd - updateActPrice4StoreSkuNameNew中对于活动与结算价，准确处理 gazebo 2019-08-06 16:10:00 +08:00
  • 7ad7a7be44 - GetEffectiveActStoreSkuInfo中的BUG，对于非结算活动类型，要判断同步状态 gazebo 2019-08-06 15:55:46 +08:00
  • c020130819 - tasksch.NewParallelTask2，支持部分失败时得到准备的成功，失败个数信息 gazebo 2019-08-06 14:20:32 +08:00
  • baa9157949 - User添加Remark gazebo 2019-08-06 11:49:42 +08:00
  • 438879ac4f - 开始添加casbin做角色，权限管理 gazebo 2019-08-06 11:26:08 +08:00
  • 407844aa81 - auth2.AddAuthBind的第一个参数从*AuthInfo改为IUser gazebo 2019-08-06 11:18:38 +08:00
  • 88ebbbf9e7 - GetUsers添加userID参数 gazebo 2019-08-06 11:15:32 +08:00
  • d0821c05b0 - up gazebo 2019-08-06 11:09:04 +08:00
  • 96a160e3b5 - 已接单改为待拣货，已拣货改为待配送 gazebo 2019-08-06 10:50:47 +08:00
  • cce39024e1 - StoreSkuExt中厂商的SKUID全部换成字符串以免JSON.parse函数在整数大于53位后丢失精度 gazebo 2019-08-06 10:33:38 +08:00
  • 1d30cad9c2 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-06 10:25:11 +08:00
  • dab32bbe0e - SelfDeliveringAndUpdateStatus中添加订单日志 gazebo 2019-08-06 10:22:05 +08:00
  • 539cfb31fe - 修复UpdateActStatusByTime中的BUG gazebo 2019-08-05 16:59:30 +08:00
  • 58b33c8e77 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-05 16:32:51 +08:00
  • 9afb12ced7 修正比较数据的BUG，添加SkuID字段到DiffData结构体 Rosy-zhudan 2019-08-05 16:32:20 +08:00
  • 4b6ed5200f - fk gazebo 2019-08-05 16:28:53 +08:00
  • 044f5860b1 - 修复DeleteConfig中删除银行的BUG gazebo 2019-08-05 15:22:17 +08:00
  • dd76433a5d Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-05 15:13:44 +08:00
  • a6ef8e4427 - ren StoreSkuExt.BindStatus to StoreSkuExt.StoreSkuStatus gazebo 2019-08-05 15:10:13 +08:00
  • e820abf686 - checkConfig添加参数key gazebo 2019-08-05 14:55:34 +08:00
  • b0b4e67e21 - up gazebo 2019-08-05 12:52:23 +08:00
  • f9b578f0ae - 门店商品可售时更新库存 gazebo 2019-08-05 12:25:29 +08:00
  • c20f7bb360 - buildCacheKey to buildCacheKey4Verify gazebo 2019-08-05 10:49:17 +08:00
  • 73169746c9 + user2/GetUsers gazebo 2019-08-05 09:38:48 +08:00
  • 9f1fd17d96 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-05 08:43:33 +08:00
  • be9f2408f4 - LoopMultiStoresVendors添加参数isManagedIt gazebo 2019-08-04 16:04:43 +08:00
  • 48b1d61194 - GetStoresVendorSnapshot排除微商城 gazebo 2019-08-04 11:52:52 +08:00
  • 582f11521c - 处理设置假营业时间的逻辑BUG（之前逻辑在10点以后重启后，可能导致库存不能恢复） gazebo 2019-08-04 09:57:18 +08:00
  • c9ce8a5b26 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-04 09:28:46 +08:00
  • 972636e434 - AutoSaleStoreSku添加参数isNeedSync控制是否主动同步，定时任务不需要，因为马上就是每晚的定时同步 gazebo 2019-08-03 22:26:03 +08:00
  • c088b793e8 - fk gazebo 2019-08-03 16:06:08 +08:00
  • 7a3bd58e63 - updateActPrice4StoreSkuNameNew中skuIDs为空直接返回 gazebo 2019-08-03 16:04:27 +08:00
  • 71d91bb102 - 启用新同步逻辑 gazebo 2019-08-03 08:40:41 +08:00
  • b85e88bef1 - doDailyWork.SyncStoresSkus改为同步 gazebo 2019-08-02 21:11:36 +08:00
  • 876af999c3 京西平台和其他平台商品的对比 Rosy-zhudan 2019-08-02 17:38:07 +08:00
  • 1d036d919b - 调价包改为按SKU的价格来使用（GetPricePercentage） gazebo 2019-08-02 17:21:13 +08:00
  • 8343061c5f - 修复BaseTask.run中消息提醒的BUG gazebo 2019-08-02 16:53:27 +08:00
  • 87d78777af - 设置门店假营业时间放在每晚例行同步任务之后 gazebo 2019-08-02 16:23:36 +08:00
  • e3e57204f6 关闭本地写文件开关 Rosy-zhudan 2019-08-02 15:39:56 +08:00
  • 6a8b2023dc Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-02 15:36:57 +08:00
  • 8518248080 - 饿百平台运单取消后，以快递费最高10元直接发三方运单 gazebo 2019-08-02 15:35:07 +08:00
  • 06d564331e 京西和平台商品差异 Rosy-zhudan 2019-08-02 15:33:28 +08:00
  • 7f40ee9963 - autoSaleAt set to 20:45:00 gazebo 2019-08-02 14:46:52 +08:00
  • 37b894e112 + 添加cms.autoSaleAt gazebo 2019-08-02 14:40:58 +08:00
  • 00e0106e9b + cms.printerStatusName gazebo 2019-08-02 14:29:48 +08:00
  • c0b6ae7de7 - 在修改美团外卖门店营业时间由于配送时间限制出错后，尝试根据限制时间调整后修改 gazebo 2019-08-02 13:10:48 +08:00
  • e2a620b305 - jd.setSkuNameListPic gazebo 2019-08-02 11:01:57 +08:00
  • 6b87bc5f27 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-02 10:26:42 +08:00
  • 92daec3d93 - 在jd.getStoreSkusBareInfoLimitSize设置Stock gazebo 2019-08-02 10:25:26 +08:00
  • e2ea3f5d63 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-02 08:47:16 +08:00
  • a5f4f054b2 + purchase/jd/store_sku2_test.go gazebo 2019-08-01 20:12:33 +08:00
  • 8af8c4e0e2 - 去掉ebai.market_price gazebo 2019-08-01 20:11:07 +08:00
  • 402e60ab50 - 整理tasksch gazebo 2019-08-01 20:07:39 +08:00
  • 76d1817348 - 加小费策略调整 gazebo 2019-08-01 19:51:40 +08:00
  • 1d0aa132f9 - GoodsOrder.WaybillTipMoney的含义改为京西主动加的小费 - partner.IUpdateWaybillTip改为IAddWaybillTip gazebo 2019-08-01 18:09:23 +08:00
  • 45948e4b09 - up gazebo 2019-08-01 17:32:43 +08:00
  • 5acb6d3edc Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-01 17:18:51 +08:00
  • 0337cd6c91 - 漏了一个文件 gazebo 2019-08-01 17:18:08 +08:00