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

Commit Graph

  • f791668f5e - 取货失败审核同意后，不更新订单状态为待配送 gazebo 2019-09-12 13:51:51 +08:00
  • 86d35d58c5 门店评分-优化内存 Rosy-zhudan 2019-09-12 11:42:20 +08:00
  • f3e64ed996 - up gazebo 2019-09-12 10:28:18 +08:00
  • 895ad8b4f6 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-12 08:40:59 +08:00
  • ad2acc3a7e 修改时间 Rosy-zhudan 2019-09-12 08:40:25 +08:00
  • 84b4d400e4 - BatchUpdateEntityByKV中不用事务 gazebo 2019-09-11 22:59:19 +08:00
  • 5ffeb4142c - fk gazebo 2019-09-11 21:55:36 +08:00
  • 9345f12738 - beta启动时自动运行netspider.GetAndStoreCitiesShops gazebo 2019-09-11 21:44:06 +08:00
  • 8e49f41227 - GetAndStoreCitiesShops会从上一次的地方继续 gazebo 2019-09-11 21:21:13 +08:00
  • 11e30ffb24 - 自订单单与假订单的调度特殊处理 gazebo 2019-09-11 18:13:08 +08:00
  • 88f55a1234 - checkConfig gazebo 2019-09-11 17:58:09 +08:00
  • 33509235e7 - fk gazebo 2019-09-11 17:48:10 +08:00
  • 5baecb3b37 - dao.QueryPageStores keyword查询licence_code gazebo 2019-09-11 17:44:09 +08:00
  • 435b4397d6 - 门店状态报警提示修改 gazebo 2019-09-11 17:37:57 +08:00
  • 8378b832a3 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-11 17:38:54 +08:00
  • 30a7c1dbe2 - 门店状态报警提示修改 gazebo 2019-09-11 17:37:57 +08:00
  • 8a955013d9 门店评分-优化 Rosy-zhudan 2019-09-11 17:37:27 +08:00
  • 569abe56b5 - 添加自提假订单处理 gazebo 2019-09-11 17:31:07 +08:00
  • 3919aafe83 - GetAndStoreCitiesShops添加参数isShuffle gazebo 2019-09-11 16:49:56 +08:00
  • 37c9acc407 - up gazebo 2019-09-11 16:35:33 +08:00
  • b2937294c9 - up gazebo 2019-09-11 16:25:41 +08:00
  • 4e52916066 - 拉取饿百门店营业执照信息 gazebo 2019-09-11 16:24:42 +08:00
  • adbaf4ff13 - up gazebo 2019-09-11 15:30:25 +08:00
  • eab614a734 + RegisterPurchaseOrderHandler（为了适应加入的京西自营商城） gazebo 2019-09-11 15:10:32 +08:00
  • bfaea1b998 门店评分并发修改 Rosy-zhudan 2019-09-11 14:49:59 +08:00
  • c0953da5a1 - debug gazebo 2019-09-11 14:49:42 +08:00
  • f2a1cff346 - 优化net_spider gazebo 2019-09-11 11:54:54 +08:00
  • 85c8354873 - up gazebo 2019-09-11 11:13:59 +08:00
  • 86fc32cf2e + GetRolesUserList gazebo 2019-09-11 11:04:29 +08:00
  • 3784696334 修正 Rosy-zhudan 2019-09-11 10:35:54 +08:00
  • f62268821e 门店配送面积计算(根据经纬度计算多边形球面积-凸多边形和凹多边形) Rosy-zhudan 2019-09-11 10:15:28 +08:00
  • f1fbcf6366 - 高德API的KEY改为公司认证的KEY，可访问量更大 - 拉取门店信息时要获取坐标及区信息 - 饿百订单买家的坐标转换为高德坐标 gazebo 2019-09-11 10:14:40 +08:00
  • b72043257c - 平台快递投递失败或取货失败后，更新订单配送信息 gazebo 2019-09-11 09:38:45 +08:00
  • f9850362b6 - jx.onOrderNew中对于StoreID与SkuID赋值 gazebo 2019-09-11 08:35:16 +08:00
  • a2bb472640 - 优化updateOrderSkuOtherInfo中对于skuID的获取处理 gazebo 2019-09-10 21:06:03 +08:00
  • a6350630bd - up gazebo 2019-09-10 18:46:04 +08:00
  • f632622b55 + ConfigSysFakeOrderMobiles gazebo 2019-09-10 18:32:55 +08:00
  • 690b4c2e69 - up gazebo 2019-09-10 18:09:08 +08:00
  • 7f05b771f4 - 设置美团外卖订单的DeliveryType字段 gazebo 2019-09-10 17:51:36 +08:00
  • e873ce0264 - 京西订单支持自提 gazebo 2019-09-10 17:36:02 +08:00
  • a90941b26e - 京西自营商城 gazebo 2019-09-10 17:21:44 +08:00
  • 40586e19a6 增加StoreScoreEx结构来获取门店名字,去掉表中的字段StoreName Rosy-zhudan 2019-09-10 15:42:26 +08:00
  • cc750af2ca - 修复SendAlarmVendorSnapshot调用GetUsers时，防止roleUserIDList为空的bug gazebo 2019-09-10 15:22:15 +08:00
  • fb8732c94c - 门店状态变化添加发送微信通知消息 gazebo 2019-09-10 11:23:39 +08:00
  • 69c57c6520 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-10 08:49:35 +08:00
  • 46f31a7136 门店评分修改 Rosy-zhudan 2019-09-10 08:48:58 +08:00
  • 7dd0da9f97 - 不支持添加系统参数 gazebo 2019-09-09 18:00:47 +08:00
  • 5f2415c8a5 - PruneMissingStoreSkus中改用NewParallelTask gazebo 2019-09-09 17:40:08 +08:00
  • cf6bd1d5ea - SyncStoresCategory中改为并行任务 gazebo 2019-09-09 17:29:25 +08:00
  • 13c9bb76d4 - PruneMissingStoreSkus的bug gazebo 2019-09-09 17:07:17 +08:00
  • 910e351c00 - PruneMissingStoreSkus也会删除本地不存在的远程分类 gazebo 2019-09-09 17:03:01 +08:00
  • eb1c8d38b9 - 修复PruneMissingStoreSkus中的bug gazebo 2019-09-09 16:05:19 +08:00
  • db5d628e75 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-09 15:38:32 +08:00
  • c3873c7614 门店评分修改 Rosy-zhudan 2019-09-09 15:37:55 +08:00
  • bb74874b12 修改门店评分BUG Rosy-zhudan 2019-09-09 14:42:01 +08:00
  • edd0e8c282 - 饿百将一个分类重复改名，也会报分类名重复错，特殊处理一下，不过因为GetStoreCategory其实会拉取所有的门店分类，是比较耗时的操作 gazebo 2019-09-09 14:23:37 +08:00
  • 322d196992 - 临时修改SendAlarmVendorSnapshot gazebo 2019-09-09 13:37:37 +08:00
  • f4e97af0e1 + 添加autils.NewStoreBossRole gazebo 2019-09-09 12:03:07 +08:00
  • 0abd1b0642 - 去除RefreshElmToken和RefreshWeimobToken的调用 gazebo 2019-09-09 11:16:18 +08:00
  • 4822f7741f 修改门店评分相关 Rosy-zhudan 2019-09-09 10:55:27 +08:00
  • 556ce853da - updateOrderOtherInfo中特殊处理京西自营商城订单 gazebo 2019-09-09 10:47:28 +08:00
  • f000f44b0d - 添加GoodsOrder.AdjustCount gazebo 2019-09-09 10:26:43 +08:00
  • 937cfe187c - up gazebo 2019-09-07 10:47:13 +08:00
  • 92b6c24347 - 调整CreateConsumerFromOrders gazebo 2019-09-07 10:37:02 +08:00
  • b1309e90ff - up gazebo 2019-09-06 18:49:20 +08:00
  • ecaddecade - 修复api.EbaiAPI.OrderDeliveryGet返回的status是整型而不是string的bug gazebo 2019-09-06 18:28:04 +08:00
  • b33fc89275 - fk gazebo 2019-09-06 18:16:43 +08:00
  • 59355f7159 - 美团坐标信息用远程 gazebo 2019-09-06 18:11:14 +08:00
  • b82327cefa 修改BUG（门店评分） Rosy-zhudan 2019-09-06 18:08:20 +08:00
  • c78b456143 - 饿百与美团外卖尽量同步手机与地址信息 gazebo 2019-09-06 18:06:37 +08:00
  • 90232c2a26 - 修复取京东订单订单级优惠金额的BUG gazebo 2019-09-06 17:37:41 +08:00
  • 5769e93cd9 Merge branch 'don' of e.coding.net:rosydev/jx-callback into don Rosy-zhudan 2019-09-06 17:34:23 +08:00
  • 52bdbdb4ff 门店评分 Rosy-zhudan 2019-09-06 17:29:09 +08:00
  • 3c3be47085 门店评分 Rosy-zhudan 2019-09-06 17:29:09 +08:00
  • f3a99cf2cd - GoodsOrder添加DiscountMoney gazebo 2019-09-06 17:25:36 +08:00
  • b10ed6d97d - 从订单来创建的用户Remark都标记为fromOrder gazebo 2019-09-06 16:39:13 +08:00
  • f28af0e190 - AuthBind.UserID加索引 gazebo 2019-09-06 16:31:56 +08:00
  • 47a0a892b6 - 重构了dao.GetAuthBind和dao.GetUserBindAuthInfo - AuthBind的唯一索引调整为"AuthID", "Type", "BindType", "DeletedAt" gazebo 2019-09-06 16:26:47 +08:00
  • a12f15af52 - up gazebo 2019-09-06 15:33:12 +08:00
  • a89928a366 - remove fuck gazebo 2019-09-06 15:11:36 +08:00
  • 2d06499663 - CreateConsumerFromOrders在限制并发数为1，以免出现主键重错误 gazebo 2019-09-06 14:24:39 +08:00
  • 9e0ca4f185 + CreateConsumerFromOrders gazebo 2019-09-06 13:45:10 +08:00
  • 898955729e - SendSMSMsg中处理重复号码的情况 gazebo 2019-09-06 13:37:47 +08:00
  • 40d9312acb Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-06 11:29:17 +08:00
  • b0022eb26e 门店评分 Rosy-zhudan 2019-09-06 11:28:29 +08:00
  • 5bc792f337 - 修改NotifyNewOrder gazebo 2019-09-06 10:45:44 +08:00
  • e52f0e260a - 发送短信时判断EnableStoreWrite gazebo 2019-09-06 10:18:09 +08:00
  • 0fbe4d7024 - 新订单时，发送短信消息 gazebo 2019-09-06 10:16:09 +08:00
  • a393869612 + Store.SMSNotify gazebo 2019-09-06 09:07:27 +08:00
  • f3d496ec60 - 查询订单运费与发三方运单时，自提单报错 gazebo 2019-09-05 18:44:08 +08:00
  • 522c9082ef - 修复dao.GetUserList的bug - QueryActs添加参数syncStatus gazebo 2019-09-05 18:02:53 +08:00
  • c7d883b51c 更新门店评分 Rosy-zhudan 2019-09-05 17:24:52 +08:00
  • f5ec608a1c - 创建或更新京西门店，注册用户时，自动根据门店的tel1,tel2添加门店老板角色 gazebo 2019-09-05 16:57:28 +08:00
  • c98745ce59 - 饿百转自送时，如果错误是已经是自送状态，则返回成功 - CreateWaybillOnProviders中部分失败时，输出出错日志 gazebo 2019-09-05 16:09:00 +08:00
  • 059e563f08 - HandleOrder4Consignee gazebo 2019-09-05 14:58:31 +08:00
  • 6efdcdf692 - GetOrderStatusList中的排序规则 gazebo 2019-09-05 09:34:48 +08:00
  • 9e5d152a48 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-05 08:37:48 +08:00
  • 4eaccdc917 门店评分 Rosy-zhudan 2019-09-05 08:37:23 +08:00
  • a0bb7d37f0 - 将IsMobileFake用IsStringLikeMobile替换 - 添加HandleOrder4Consignee, GetRealMobile4Order和GetAuthType4Vendor - 添加GoodsOrder.VendorUserID gazebo 2019-09-04 18:50:25 +08:00
  • f50fdf2bab - 不注册京西到PurchaseHandlers gazebo 2019-09-04 17:54:35 +08:00