gazebo
|
457bd4b0a2
|
GetStoreOrderAfterTime排除内部单
|
2019-12-03 17:52:51 +08:00 |
|
gazebo
|
b25b7ebe41
|
fk
|
2019-12-03 16:38:20 +08:00 |
|
gazebo
|
86f37ba367
|
up
|
2019-12-03 16:36:20 +08:00 |
|
gazebo
|
c75769495a
|
remove some comment
|
2019-12-03 15:54:33 +08:00 |
|
gazebo
|
902c770515
|
调整GetOrders中的排序逻辑
|
2019-12-03 15:34:14 +08:00 |
|
gazebo
|
84dac23be8
|
京东回调消息根据token动态选择不同的配置
|
2019-12-03 15:07:50 +08:00 |
|
gazebo
|
ea3cd1b833
|
fk
|
2019-12-03 12:12:03 +08:00 |
|
gazebo
|
596afbd8c5
|
fk
|
2019-12-03 12:08:51 +08:00 |
|
gazebo
|
dabbfc1dd6
|
up
|
2019-12-03 11:57:27 +08:00 |
|
gazebo
|
c98299cdcb
|
debug
|
2019-12-03 11:48:16 +08:00 |
|
gazebo
|
38046bbe24
|
尽量减少对于api.JdAPI的直接依赖
|
2019-12-03 11:21:54 +08:00 |
|
gazebo
|
e7199741a4
|
手机号正则修改，包括16开头的手机号
|
2019-12-03 10:32:48 +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 |
|
gazebo
|
a03aa52be2
|
GoodsOrder.UserID as index
|
2019-12-02 21:59:50 +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
|
5c8af121d6
|
ExpectedDeliveredTime
|
2019-12-02 18:14:02 +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 |
|
gazebo
|
0f636d2274
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-02 15:07:58 +08:00 |
|
gazebo
|
244c653398
|
mtwm.AcceptOrRefuseOrder中容错
|
2019-12-02 15:07:16 +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 |
|
gazebo
|
351551bfe1
|
up
|
2019-12-02 14:24:23 +08:00 |
|
gazebo
|
dc881a2acc
|
fk
|
2019-12-02 12:16:50 +08:00 |
|
gazebo
|
35a05e2b9d
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-02 12:10:57 +08:00 |
|
gazebo
|
ab4251e5b9
|
OrderPrice的bug
|
2019-12-02 12:07:39 +08:00 |
|
gazebo
|
d033383eef
|
OrderPrice的bug
|
2019-12-02 12:05:23 +08:00 |
|
gazebo
|
1454d08119
|
generateOrder中处理活动的情况
|
2019-12-02 11:32:28 +08:00 |
|
苏尹岚
|
d4edd5d06d
|
订单门钉归属修改
|
2019-12-02 11:30:36 +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
|
0a42beac8a
|
+GetMyOrderCountInfo
|
2019-12-02 11:00:57 +08:00 |
|
gazebo
|
67976664e6
|
fk
|
2019-12-02 08:55:51 +08:00 |
|
gazebo
|
36d964ef93
|
AutoSaleAtStr改为22:00:00
|
2019-12-01 17:03:44 +08:00 |
|
gazebo
|
0b4886c246
|
限制美团活动最小折扣为3折
活动至少要有98折
|
2019-11-30 14:11:46 +08:00 |
|
gazebo
|
5f2da8a4dc
|
取消活动时，也要将act_store_sku_map中条目相应置删除标志
|
2019-11-29 20:27:07 +08:00 |
|
苏尹岚
|
6c0c837fae
|
门店归属订单不漏
|
2019-11-29 17:48:29 +08:00 |
|
gazebo
|
6d1129a61c
|
up
|
2019-11-29 17:19:24 +08:00 |
|
gazebo
|
09944d68cd
|
每晚自动补全前一天与当天订单
|
2019-11-29 17:15:01 +08:00 |
|
gazebo
|
9f3eb98db0
|
启用ChangeStoreSkuSaleStatus日常任务
|
2019-11-29 16:49:09 +08:00 |
|
gazebo
|
899e516a75
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-29 16:28:36 +08:00 |
|
gazebo
|
d93356ad01
|
饿百在发送运单取消事件后，如果订单没有及时（具体时间未知）转出自送，则订单会被取消，且不会发送订单取消事件
|
2019-11-29 16:28:21 +08:00 |
|