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

Commit Graph

  • 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
  • 5105a00075 - RegisterUser-->RegisterUserWithMobile gazebo 2019-09-04 17:44:20 +08:00
  • c2f76e38b6 - RegisterUser修改操作人员为IP加认证ID gazebo 2019-09-04 16:47:20 +08:00
  • 8067c8f3de - up gazebo 2019-09-04 16:30:50 +08:00
  • e7b4352789 - mtwm.onNumberDowngrade优化 gazebo 2019-09-04 15:17:19 +08:00
  • f55a744570 - 处理美团外卖隐私号降级的情况 gazebo 2019-09-04 15:13:27 +08:00
  • 0bdcdde11c - 添加IStoreSkuSorter接口，但当前无实际平台支持 gazebo 2019-09-04 11:42:58 +08:00
  • 4be654fc3e - 修改一下BaseScheduler.ConfirmSelfTake在不能自动取得自提货码时报错。 gazebo 2019-09-04 08:43:39 +08:00
  • 3eb83f4dfc + TestGetSelfTakeCode gazebo 2019-09-03 18:28:06 +08:00
  • d54a4f569a - 京东到家自提单支持，新增API:ConfirmSelfTake, GoodsOrder新增字段DeliveryType gazebo 2019-09-03 18:18:54 +08:00
  • d3a549a085 - fk gazebo 2019-09-03 16:55:01 +08:00
  • 44bc47b05e - 去掉对于ede_skus与jde_sku_infos的依赖 gazebo 2019-09-03 16:01:48 +08:00
  • e22a171176 - 去掉对于ebde_shops与jde_store的依赖 gazebo 2019-09-03 15:58:26 +08:00
  • 9bff8840e5 - User.GetMobile and User.GetEmail bug修改 gazebo 2019-09-03 15:51:15 +08:00
  • dad8adc4bf + AuthBind中添加BindType - 合并函数GetAuthBindsByAuthID2 - User中的mobile与email改为可为null gazebo 2019-09-03 15:35:54 +08:00
  • 2afa452d78 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-09-03 14:49:08 +08:00
  • ad1bcd36ff 门店评分 Rosy-zhudan 2019-09-03 14:48:37 +08:00
  • 73c5656be2 - ActStoreSku2添加Type，活动类型 gazebo 2019-09-03 14:45:07 +08:00
  • 23e9adc86e - 平台门店名存储原始全名 gazebo 2019-09-03 11:22:16 +08:00
  • 14ce826e6e - 修复updateVendorStoreStatusBySnapshot中更新平台门店名的BUG gazebo 2019-09-03 10:21:47 +08:00
  • 0f69e9b51e - 拉取平台信息时，存储平台门店名 gazebo 2019-09-03 08:55:28 +08:00
  • 4e617f4ef5 - 京西自营商城可以存订单了 gazebo 2019-09-02 18:33:43 +08:00
  • 7ca4429e43 - remove globals.ReallyReplyComment gazebo 2019-09-02 16:53:22 +08:00
  • e4f1812337 - 绑定认证方式前，先删除可能的相同的认证方式 gazebo 2019-09-02 14:53:18 +08:00
  • c0c79c368d - 用户已经存在，自动继承时，正确更新当前认证方式 gazebo 2019-09-02 14:27:34 +08:00
  • f0d8582b12 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2019-09-02 14:04:48 +08:00
  • 3d21ffaf11 - 禁用auth1. gazebo 2019-09-02 14:04:27 +08:00
  • 6c8ab5cc6c Accept Merge Request #2: (don -> mark) Merge Request: 优化重排序商品 Created By: @zhudan Accepted By: @zhudan URL: https://rosydev.coding.net/p/jx-callback/git/merge/2 zhudan 2019-09-02 11:21:01 +08:00
  • b12d7dad77 优化重排序商品 Rosy-zhudan 2019-09-02 11:13:46 +08:00
  • de6c5de6df - SkuCategoryMap gazebo 2019-09-02 10:42:38 +08:00
  • a32c805785 Accept Merge Request #1: (don -> mark) Merge Request: 打开刷新假开店开关 Created By: @zhudan Accepted By: @zhudan URL: https://rosydev.coding.net/p/jx-callback/git/merge/1 zhudan 2019-09-02 10:23:45 +08:00
  • 9307114a7a + sync2.go gazebo 2019-09-02 09:31:26 +08:00
  • bb7a2ce37b 打开刷新假开店开关 Rosy-zhudan 2019-09-02 08:58:58 +08:00
  • 16e9e02e94 - getOrders的keyword搜索vendor_order_id2 gazebo 2019-09-01 17:29:30 +08:00
  • 0331e704e0 + IPurchasePlatformHandler.UpdateStoreCustomID - 删除平台门店时，将平台门店的CUSTOMID设置为其平台ID本身 - 饿了么与微商城handler不注册了 gazebo 2019-09-01 15:27:06 +08:00
  • 51727df4de - RebindAllPrinters中改用NewParallelTask gazebo 2019-09-01 10:06:28 +08:00
  • bb69051742 - 修复将易联云token中的ExpireIn处理错误（没有当成秒） gazebo 2019-08-31 11:26:50 +08:00
  • 4a700fc476 - 处理京东查询证照返回的有效期非法的情况 gazebo 2019-08-30 19:01:54 +08:00
  • f74901739c - GetSkuNames返回Sku.Seq gazebo 2019-08-30 18:56:48 +08:00
  • 5e0f93a1c8 - 展示门店商品时，在分类下，按Sku.Seq排序 gazebo 2019-08-30 18:41:44 +08:00
  • 3e7b07fc9e - UpdateSkuName中的delete几个改为小驼峰 gazebo 2019-08-30 18:16:38 +08:00
  • 8f8dc30333 Accept Merge Request #41: (don -> mark) Merge Request: 商品子分类下商品的重排序 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/41 XJH-Rosy 2019-08-30 18:13:11 +08:00
  • b9ec8067ac 修改问题 Rosy-zhudan 2019-08-30 16:59:46 +08:00
  • 02bb89d67d Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-30 16:01:12 +08:00
  • c8c09640dc 去掉seq Rosy-zhudan 2019-08-30 16:00:44 +08:00
  • 03296d1a99 - dao.GetSkuByCats中，要判断sku_name是否被删除了 gazebo 2019-08-30 15:56:43 +08:00
  • a7270ccd84 修改各处商品查询加入Seq排序字段 Rosy-zhudan 2019-08-30 15:08:44 +08:00
  • de91ac4a20 “测试优化 Rosy-zhudan 2019-08-30 14:09:50 +08:00
  • d428a0334a - 注释掉价格审核相关的一些代码 gazebo 2019-08-30 14:07:25 +08:00
  • 8ec7239b1d 优化速度 Rosy-zhudan 2019-08-30 13:42:10 +08:00
  • a1086344ca 优化速度 Rosy-zhudan 2019-08-30 13:38:42 +08:00
  • 46527e139e - enablePendingChange = false gazebo 2019-08-30 12:21:48 +08:00
  • 0b899d612f - UpdateStoresSkus中添加调试信息 gazebo 2019-08-30 12:09:27 +08:00
  • 7afd15cf0e - 优化dao.GenQuestionMarks gazebo 2019-08-30 09:54:23 +08:00
  • 088d83417f 删除更新SKU商品数据时的seq字段 Rosy-zhudan 2019-08-30 09:20:36 +08:00
  • e0bbfa0150 商品子分类下商品的重排序 Rosy-zhudan 2019-08-30 08:58:37 +08:00
  • 27adff6add - ParallelTask结束后，清除subFinishChan与taskChan gazebo 2019-08-30 08:50:07 +08:00
  • bfa6ca2b9e - CaculateSkuEarningPrice支持四舍五入 gazebo 2019-08-29 17:47:50 +08:00
  • 53a9a78b1d Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark gazebo 2019-08-29 17:32:13 +08:00
  • 21b66cc482 - updateOrderSkuOtherInfo中固化订单商品的EarningPrice gazebo 2019-08-29 17:31:21 +08:00
  • 24c25246a9 Accept Merge Request #40: (don -> mark) Merge Request: 生成Base64格式的二维码/条形码 Created By: @Nathan drake Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/40 XJH-Rosy 2019-08-29 16:18:53 +08:00
  • 1ea9c5aca2 修正和重构代码 Rosy-zhudan 2019-08-29 16:05:29 +08:00
  • 21c1c3c514 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-29 15:20:17 +08:00
  • f2d049bdef 修正错误 Rosy-zhudan 2019-08-29 15:19:43 +08:00
  • 81ae87f5a5 - 优化GetStoreSkus2中的SQL（强制转换vendor_category_id至字符串以使用索引） gazebo 2019-08-29 15:13:36 +08:00
  • 511a0b02e9 Merge remote-tracking branch 'origin/mark' into don Rosy-zhudan 2019-08-29 14:49:09 +08:00
  • ebfc3c3a9a 生成Base64格式的二维码/条形码 Rosy-zhudan 2019-08-29 14:48:13 +08:00
  • ce5fc2ef9d - 优化AddCreateFlagForJxStoreSku gazebo 2019-08-29 13:59:41 +08:00
  • ce53d17461 - UnmanageTasks中添加GC gazebo 2019-08-29 12:02:10 +08:00