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

Commit Graph

  • 571b400229 fix bug in SyncReorderCategories gazebo 2020-01-14 14:36:19 +08:00
  • 7d57fa54b4 Accept Merge Request #140: (yonghui -> mark) Merge Request: 订单详情增加用户信息 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/140 苏尹岚 2020-01-13 18:26:19 +08:00
  • 0178156c65 订单详情增加用户信息 苏尹岚 2020-01-13 18:18:58 +08:00
  • 975d204bfb Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-13 17:55:57 +08:00
  • 4751a14f0f 创建活动时在act_store_sku_map表中记录EarningPrice gazebo 2020-01-13 17:53:06 +08:00
  • 1630d0eac9 Accept Merge Request #139: (yonghui -> mark) Merge Request: 中位价计算方式修改，乘除替换 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/139 苏尹岚 2020-01-13 16:46:39 +08:00
  • fa899540f9 中位价价格算法修改，乘除换一下 苏尹岚 2020-01-13 16:43:06 +08:00
  • c03702dacf Accept Merge Request #138: (su -> mark) Merge Request: 排除每天自动同步产生的错误 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/138 苏尹岚 2020-01-13 15:14:54 +08:00
  • 3525a3ea56 排除每天自动同步 苏尹岚 2020-01-13 15:14:15 +08:00
  • b20295208c Accept Merge Request #137: (yonghui -> mark) Merge Request: 畅销品自动关注，暂时只整4个小城市 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/137 苏尹岚 2020-01-13 14:55:12 +08:00
  • 8c9b4081c8 推荐商品自动关注，修改，以及暂时只整4个小城市 苏尹岚 2020-01-13 14:53:40 +08:00
  • d29b7b3686 globals.IsStoreSkuAct控制是否添加门店商品的平台活动信息 gazebo 2020-01-13 14:17:50 +08:00
  • ce74fb7128 畅销品查询终极修改 苏尹岚 2020-01-13 12:51:14 +08:00
  • 31cc85e21c 调试信息输出 苏尹岚 2020-01-13 12:01:25 +08:00
  • 0fd1880dae 输出调试信息 苏尹岚 2020-01-13 11:56:57 +08:00
  • fb36ee4c68 畅销品查询修改 苏尹岚 2020-01-13 11:47:08 +08:00
  • 5595c56cb6 畅销品查询 eariningPrice修改 苏尹岚 2020-01-13 10:51:35 +08:00
  • 353588b0db Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-13 10:51:10 +08:00
  • a456557418 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-13 10:50:47 +08:00
  • 21accbf8fe Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-13 10:43:51 +08:00
  • b60d792194 UpdateActPrice4StoreSkuNameNew中bug修复 gazebo 2020-01-13 10:42:26 +08:00
  • a17f8393cc 畅销品查询，查询活动增加payPercentage（bug） 苏尹岚 2020-01-13 10:25:35 +08:00
  • de55fb9cb2 畅销品查询，查询活动增加storeid（bug） 苏尹岚 2020-01-13 10:12:14 +08:00
  • 0f2a475d81 Accept Merge Request #135: (yonghui -> mark) Merge Request: 同步函数增加parentTask Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/135 苏尹岚 2020-01-13 10:05:58 +08:00
  • 8d5f9cd9a6 畅销品查询修改 苏尹岚 2020-01-13 10:00:40 +08:00
  • 3106f2a5d8 getAddressInfoFromCoord中处理找不到位置的情况。 gazebo 2020-01-13 09:58:05 +08:00
  • d6eed9671d Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-13 09:57:02 +08:00
  • 93d1c46408 畅销品查询修改 苏尹岚 2020-01-13 09:56:42 +08:00
  • f6d171936a 畅销品查询增加活动字段 苏尹岚 2020-01-13 09:13:53 +08:00
  • 2f168f2c74 畅销品推荐增加活动字段 苏尹岚 2020-01-13 09:12:02 +08:00
  • c1fae06a73 Accept Merge Request #136: (su -> mark) Merge Request: 同步错误返回合并 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/136 苏尹岚 2020-01-13 09:08:36 +08:00
  • 78fcdeaf39 查询推荐品，新增活动系列字段 苏尹岚 2020-01-13 09:03:02 +08:00
  • aff821e09d 同步创建门店商品filedList返回修改 苏尹岚 2020-01-10 17:57:26 +08:00
  • 65a54b603b 批量关注返回值修改 苏尹岚 2020-01-10 17:44:47 +08:00
  • b0771601f6 同步函数增加parentTask 苏尹岚 2020-01-10 17:02:17 +08:00
  • 90cebe1a5a Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2020-01-10 16:11:32 +08:00
  • c12f6288de 改错地方了 苏尹岚 2020-01-10 16:09:45 +08:00
  • 319a4779b1 饿百接口返回暂时加一个返回值保持兼容 苏尹岚 2020-01-10 16:02:40 +08:00
  • cce92601eb Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-10 15:57:16 +08:00
  • 4d4501cea0 Merge branch 'master' into mark gazebo 2020-01-10 15:56:58 +08:00
  • 4e4afc00f5 同步错误返回修改 苏尹岚 2020-01-10 15:51:12 +08:00
  • 72be249c77 同步错误补全 苏尹岚 2020-01-10 15:35:01 +08:00
  • 0cd7a5de3e 饿百api返回failedlist调整 苏尹岚 2020-01-10 15:11:02 +08:00
  • 279e71a2ea 同步错误返回修改：从task中获取failedList才返回新的同步错 苏尹岚 2020-01-10 14:38:25 +08:00
  • c6f3e49be8 同步统一返回错误增加判断（尝试） 苏尹岚 2020-01-10 14:32:09 +08:00
  • d520cfe4bc 同步错误返回，新增同步错误类型，修改错误返回判断条件 苏尹岚 2020-01-10 14:00:55 +08:00
  • 0bf8321524 Accept Merge Request #134: (yonghui -> mark) Merge Request: 根据skuid批量关注可售商品-修改入参和组合数据 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/134 苏尹岚 2020-01-10 13:32:41 +08:00
  • 208f89f9cf 饿百新运单事件要查询快递员信息，因为可能事件错序 gazebo 2020-01-10 12:22:13 +08:00
  • c9c7e3458e Merge commit 'ff13ecc047d013a7a349681a584afb9bc009ea54' gazebo 2020-01-10 12:19:45 +08:00
  • f0a8a84ae0 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-10 11:15:12 +08:00
  • adf4407e93 根据skuid批量关注 苏尹岚 2020-01-10 11:14:53 +08:00
  • 6616e57a5c 结算忽略重叠检查 gazebo 2020-01-10 10:25:23 +08:00
  • 91d1d1d252 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-09 18:01:07 +08:00
  • 2f7cd0bb5a Accept Merge Request #51: (su -> mark) Merge Request: 同步错误返回 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/51 苏尹岚 2020-01-09 17:53:37 +08:00
  • e430c8ae59 同步错误返回 苏尹岚 2020-01-09 17:53:13 +08:00
  • 08be46ca02 同步错误 苏尹岚 2020-01-09 17:44:28 +08:00
  • 867f94a3f1 ActStoreSkuParam2Model重叠判断逻辑 gazebo 2020-01-09 17:32:02 +08:00
  • 2b872e34cd 同步错误 苏尹岚 2020-01-09 15:41:00 +08:00
  • ff13ecc047 Accept Merge Request #133: (yonghui -> mark) Merge Request: 推荐商品查询修改 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/133 苏尹岚 2020-01-09 15:37:02 +08:00
  • d594f137f7 Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-09 15:31:51 +08:00
  • 5938092d0f 自动关注畅销品 苏尹岚 2020-01-09 15:31:39 +08:00
  • 7bc490c7e8 根据skuid关注商品 苏尹岚 2020-01-09 15:14:15 +08:00
  • b4a2970c5b 同步错误 苏尹岚 2020-01-09 14:57:24 +08:00
  • 3f151a07c5 Accept Merge Request #132: (yonghui -> mark) Merge Request: 改规格->改价 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/132 苏尹岚 2020-01-09 14:47:11 +08:00
  • 8f78abc97d 冲突处理 苏尹岚 2020-01-09 14:45:51 +08:00
  • 20fc83000e 改规格->改价 苏尹岚 2020-01-09 14:42:39 +08:00
  • 580b3c735f dao.QueryActs改参数skuID为skuIDs gazebo 2020-01-09 14:15:07 +08:00
  • e6c59c4850 同步错误返回 苏尹岚 2020-01-09 14:02:32 +08:00
  • 59d21cce7f updateStoresSkusWithoutSync gazebo 2020-01-09 12:01:54 +08:00
  • da3c177e54 build失败处理 苏尹岚 2020-01-09 11:00:10 +08:00
  • cda6d91dae Merge remote-tracking branch 'origin/mark' into yonghui 苏尹岚 2020-01-09 10:32:28 +08:00
  • 506eb7c929 dao.GetStoreSkus和dao.GetFullStoreSkus忽略sku与skuName的状态检查 gazebo 2020-01-09 10:13:19 +08:00
  • 2629779e6d up gazebo 2020-01-09 09:58:48 +08:00
  • 77e4fb078f 同步错误返回 苏尹岚 2020-01-09 08:50:23 +08:00
  • 70376fb6e7 冲突处理 苏尹岚 2020-01-09 08:46:26 +08:00
  • 8f7e1fd1bb 操作日志 苏尹岚 2020-01-09 08:31:44 +08:00
  • 27e13ecb99 fk gazebo 2020-01-08 18:40:39 +08:00
  • ce41890da7 alipayAppID gazebo 2020-01-08 18:36:55 +08:00
  • 3ea689951b updateStoresSkusWithoutSync中改价是判断价格是否一致 gazebo 2020-01-08 18:32:29 +08:00
  • fbabc83524 Accept Merge Request #131: (yonghui -> mark) Merge Request: 增加同步返回错误 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/131 苏尹岚 2020-01-08 18:09:56 +08:00
  • 7101582522 增加同步错误 苏尹岚 2020-01-08 18:09:04 +08:00
  • c196e7aab9 添加支付宝登录方式：alipaycode gazebo 2020-01-08 18:06:53 +08:00
  • 19ab93ab1e 同步错误 苏尹岚 2020-01-08 16:07:36 +08:00
  • 90513226e9 同步错误 苏尹岚 2020-01-08 15:50:55 +08:00
  • 2b3d7ce83a 同步错误 苏尹岚 2020-01-08 15:35:53 +08:00
  • 74e52a0d94 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2020-01-08 14:41:06 +08:00
  • e5db4f27b1 操作日志 苏尹岚 2020-01-08 14:26:31 +08:00
  • 510b9e8483 修复处理投递失败的BUG gazebo 2020-01-08 11:38:46 +08:00
  • a56a5b1ec7 OrderSkuDiscountTypeTe gazebo 2020-01-08 11:12:12 +08:00
  • b121695eef Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2020-01-08 10:45:36 +08:00
  • 68494268ce Accept Merge Request #130: (yonghui -> mark) Merge Request: 根据skuid部分关注 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/130 苏尹岚 2020-01-08 10:43:01 +08:00
  • a3e4503081 根据skuid部分关注 苏尹岚 2020-01-08 10:42:34 +08:00
  • 256c00d31b Accept Merge Request #129: (yonghui -> mark) Merge Request: 根据skuid 部分关注 Created By: @苏尹岚 Accepted By: @苏尹岚 URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/129 苏尹岚 2020-01-08 10:41:14 +08:00
  • 9c6b27ed56 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark gazebo 2020-01-08 10:39:19 +08:00
  • 82eb16ba66 商品部分关注 苏尹岚 2020-01-08 10:39:16 +08:00
  • b92cff3338 !token改为7部分 gazebo 2020-01-08 10:38:55 +08:00
  • 4a51bfca9b +StoresOrderSaleInfo.DistanceFreightMoney, WaybillTipMoney gazebo 2020-01-08 10:38:08 +08:00
  • d7ae6eb9a2 屏蔽接口 苏尹岚 2020-01-08 10:30:03 +08:00
  • 296d877d55 批量关注修改 苏尹岚 2020-01-08 10:20:50 +08:00
  • 48d8b3f772 Merge remote-tracking branch 'origin/mark' into su 苏尹岚 2020-01-08 10:03:19 +08:00