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

Commit Graph

  • 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
  • 016bd553e3 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-01 17:17:36 +08:00
  • 046c8beef9 - FreeBatchStoreSkuInfo及FreeBatchStoreSkuSyncInfo,FreeBatchCategoryIDOp并行数改为1 - FreeBatchStoreSkuInfo及FreeBatchStoreSkuSyncInfo任务handler添加task参数 gazebo 2019-08-01 17:16:01 +08:00
  • 66c3b86762 同步修改 Rosy-zhudan 2019-08-01 17:05:09 +08:00
  • 0899c1f266 Accept Merge Request #24: (temp -> mark) Merge Request: 添加是否异步等参数，区分菜市和果园的刷新时间 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/24 XJH-Rosy 2019-08-01 16:45:38 +08:00
  • 018ae0e4f9 添加是否异步等参数，区分菜市和果园的刷新时间 Rosy-zhudan 2019-08-01 16:38:21 +08:00
  • 852fff6eff - 重构tasksch gazebo 2019-08-01 16:20:52 +08:00
  • 6f105a7598 对比京西和平台商品差异 Rosy-zhudan 2019-08-01 16:00:43 +08:00
  • 66fcd42fc6 - 所有环境起用AutoSaleStoreSku gazebo 2019-08-01 15:11:33 +08:00
  • a31ba8f730 - 整理tasksch gazebo 2019-08-01 14:29:22 +08:00
  • 43f33799f7 - 在updateStoresSkusWithoutSync中清除AutoSaleAt gazebo 2019-08-01 14:21:08 +08:00
  • 6bb793ab10 - GetStoreSkus返回autoSaleAt gazebo 2019-08-01 14:13:55 +08:00
  • ccfebdb7ac - UpdateStore中只有在需要时才调用updateCourierStores - 修复jd.GetSkus的BUG gazebo 2019-08-01 13:50:54 +08:00
  • fe5bb1e844 - 修复CreateWaybillOnProviders中的BUG gazebo 2019-08-01 10:58:52 +08:00
  • a7b9a49982 - 启用门店商品临时不可售，暂时不建AutoSaleAt相关的索引 gazebo 2019-08-01 10:37:23 +08:00
  • 84c0b93ec4 + partner.GetSkus, jd.GetSkus gazebo 2019-08-01 10:16:26 +08:00
  • 57829c5f0e - 添加小费成功后直接更新本地小费信息 gazebo 2019-07-31 20:08:33 +08:00
  • 758f44b439 - CreateWaybillOnProviders4SavedOrder及CreateWaybillOnProviders添加excludeCourierVendorIDs参数 gazebo 2019-07-31 20:05:23 +08:00
  • a69c591f6c - mtps token更新 gazebo 2019-07-31 19:56:29 +08:00
  • 48132e3155 - 因应jdapi.QuerySkuInfos和QueryListBySkuIds接口改变 gazebo 2019-07-31 18:11:37 +08:00
  • d58f2879d7 - GetTokenInfo特殊处理ErrTokenIsInvalid gazebo 2019-07-31 17:31:00 +08:00
  • a65bf09ac4 - 将加小费的起始计算时间统一为平台创建运单的时间 gazebo 2019-07-31 16:32:37 +08:00
  • 4244a7def1 - 定时达订单暂时禁用加小费 gazebo 2019-07-31 15:43:57 +08:00
  • adc570ee2e + GoodsOrder.WaybillTipMoney gazebo 2019-07-31 15:23:35 +08:00
  • 75e5e99273 - GetMyStoreList 返回城市名 gazebo 2019-07-31 15:17:13 +08:00
  • e853b45176 - 去除UserProvide.CreateUser gazebo 2019-07-31 15:06:07 +08:00
  • 289ca5a6ec - 将加小费从每5分钟加1元改为每10分钟加1元 - 添加isAddWaybillTipDisabled，避免在平台快递接单后（但没有发送订单配送中消息）无谓的尝试加小费 gazebo 2019-07-31 14:17:37 +08:00
  • 2487598e87 - 修复在收到拣货完成事件时，设置TIMER计算duration的bug gazebo 2019-07-31 14:01:45 +08:00
  • 8ad7f9fa3b - 处理小费时，对于定时达特殊处理 gazebo 2019-07-31 13:49:56 +08:00
  • 7251a2008d Accept Merge Request #23: (don -> mark) Merge Request: 并发处理 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/23 XJH-Rosy 2019-07-31 11:51:39 +08:00
  • cd8670da4e 加日志头 Rosy-zhudan 2019-07-31 11:42:49 +08:00
  • 907f2b1739 - 三方配送检查平台门店的DeliveryCompetition配置 gazebo 2019-07-31 11:22:15 +08:00
  • 8739d84e66 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-07-31 11:05:01 +08:00