Commit Graph

1002 Commits

Author SHA1 Message Date
苏尹岚
d570664efa 推荐分类 2019-12-03 11:03:52 +08:00
苏尹岚
dc58180729 推荐商品 2019-12-03 10:45:42 +08:00
gazebo
0a6136731e Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-03 10:17:29 +08:00
gazebo
30b5ff0c70 尽量去掉对于UpdateEntityLogicallyAndUpdateSyncStatus的使用 2019-12-03 10:17:12 +08:00
苏尹岚
8c196ab87f 推荐商品 2019-12-03 10:09:55 +08:00
苏尹岚
9b382088c4 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-03 09:18:48 +08:00
苏尹岚
0c55b76bf1 推荐商品 2019-12-03 09:18:31 +08:00
gazebo
30e918c5e2 删除历史无用的代码 2019-12-03 09:15:58 +08:00
苏尹岚
33fbbf7192 禁用京东用户 2019-12-02 19:02:14 +08:00
苏尹岚
ef7d9814fb Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-02 18:23:58 +08:00
苏尹岚
4e17b43a22 京东用户处理 2019-12-02 18:23:39 +08:00
gazebo
b6659baf72 分类重新排序时没有正确更新JdSyncStatus修复 2019-12-02 16:21:59 +08:00
苏尹岚
1f3ee86edd Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-02 16:15:14 +08:00
苏尹岚
73f8bfd28f 禁用京东用户 2019-12-02 16:14:56 +08:00
徐建华
34a1f1d954 Accept Merge Request #48: (yonghui -> mark)
Merge Request: 门店订单归属补漏
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/48
2019-12-02 14:37:09 +08:00
苏尹岚
410f671a36 冲突修改 2019-12-02 11:14:20 +08:00
苏尹岚
3c5afc31b6 接口位置移动,门店归属补漏修改,获取京东用户修改 2019-12-02 11:12:09 +08:00
gazebo
71bc871bdb StoreSkuNameExt.Skus2改为Skus 2019-12-02 11:08:57 +08:00
gazebo
36d964ef93 AutoSaleAtStr改为22:00:00 2019-12-01 17:03:44 +08:00
gazebo
ebb846dca8 GetStoresSkusNew中正确处理actVendorID 2019-11-29 15:06:14 +08:00
gazebo
ab493a59fb +GetMyOrders 2019-11-29 10:35:38 +08:00
gazebo
3756ac67b2 调整依赖结构,jxutils不依赖于dao,dao依赖于jxutils 2019-11-29 08:43:36 +08:00
gazebo
412fe44d32 按活动要求强制刷新商品平台价 2019-11-28 08:59:56 +08:00
gazebo
7410da75fd +GetOrderPay
GetOrders添加参数isPurchase
2019-11-27 10:05:26 +08:00
gazebo
f7144ecde1 GetStoresSkus返回商品可售时段 2019-11-22 16:39:29 +08:00
gazebo
3edc4b0e37 syncStoreSkuNew中强制出错继续 2019-11-21 15:38:49 +08:00
苏尹岚
53d9c30dfa 时间范围修改 2019-11-21 13:48:10 +08:00
gazebo
75caa1fffd 处理UpdateStore时,传入autoEnableAt引起的crash 2019-11-20 22:21:35 +08:00
苏尹岚
0e481ffe72 Merge remote-tracking branch 'origin/mark' into su 2019-11-20 09:55:42 +08:00
苏尹岚
b6dced6a3c 时间校验 2019-11-20 09:55:30 +08:00
gazebo
56869ef22a +StoreSkuNamesInfo添加actType 2019-11-19 16:06:56 +08:00
苏尹岚
34047548ed 时间校验 2019-11-19 15:55:20 +08:00
苏尹岚
bd665daa8e 更新门店营业时间 2019-11-18 16:23:08 +08:00
苏尹岚
9acd28873d 更新门店营业时间 2019-11-18 16:21:11 +08:00
苏尹岚
4e3f9938dd 更新门店营业时间 2019-11-18 16:18:19 +08:00
苏尹岚
c8e1ccb37e 更新门店营业时间 2019-11-18 16:12:46 +08:00
苏尹岚
ba6439b752 定时商品可售时间 2019-11-18 15:11:45 +08:00
苏尹岚
2a3a65ff44 时间校验修改 2019-11-18 14:44:34 +08:00
苏尹岚
ebe4319ab0 Merge remote-tracking branch 'origin/mark' into su 2019-11-18 14:42:07 +08:00
苏尹岚
a1e834a0bc 时间校验修改 2019-11-18 14:41:56 +08:00
gazebo
07f33ccfe6 ChangeStoreSkuSaleStatus调用时要判断之前是否成功 2019-11-18 11:33:01 +08:00
苏尹岚
398f614a57 Merge remote-tracking branch 'origin/mark' into su 2019-11-18 09:38:08 +08:00
苏尹岚
b31adda4d5 商品可售时间设置校验 2019-11-18 09:37:52 +08:00
gazebo
262b5da3c5 GetStoresSkusNew没有正确处理PayPercentage 2019-11-17 21:30:44 +08:00
gazebo
293226d002 up 2019-11-15 22:00:52 +08:00
gazebo
da69dd0216 修复添加商品可售时间引入的bug 2019-11-15 18:12:59 +08:00
gazebo
ddbb1622fa debug 2019-11-15 18:03:49 +08:00
苏尹岚
9e204e8595 Accept Merge Request #25: (su -> mark)
Merge Request: 定时刷新商品可售状态
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/25
2019-11-15 16:57:33 +08:00
苏尹岚
b2e82bada8 定时刷新 2019-11-15 16:56:46 +08:00
gazebo
14721125d7 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-11-15 16:40:42 +08:00