Commit Graph

655 Commits

Author SHA1 Message Date
gazebo
b9421e7979 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-06 14:55:34 +08:00
gazebo
92ecba727d 新SyncSkus基本能工作 2019-12-06 14:55:16 +08:00
苏尹岚
388a8da753 推荐商品,分类 2019-12-06 13:54:26 +08:00
苏尹岚
ab7201e973 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-06 09:05:16 +08:00
苏尹岚
c6abdbbd3e 价格参考 2019-12-06 09:04:55 +08:00
gazebo
61eed7f9e2 FullSyncStoresSkus支持excludeSkuIDs
每晚同步京东改为FullSyncStoresSkus
2019-12-05 19:05:57 +08:00
苏尹岚
8b29246088 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-05 14:47:08 +08:00
苏尹岚
9dd4c76074 获取各平台未营业门店 2019-12-05 14:46:52 +08:00
gazebo
d25ce87ebf up 2019-12-04 18:30:34 +08:00
gazebo
5cecffc501 +ConstrainPayPercentage 2019-12-04 18:17:44 +08:00
苏尹岚
621ae66f6e Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-04 17:56:08 +08:00
gazebo
4d3eb5d94c 添加改价时的isScale 2019-12-04 17:49:45 +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
38046bbe24 尽量减少对于api.JdAPI的直接依赖 2019-12-03 11:21:54 +08:00
苏尹岚
d570664efa 推荐分类 2019-12-03 11:03:52 +08:00
苏尹岚
0c55b76bf1 推荐商品 2019-12-03 09:18:31 +08:00
苏尹岚
410f671a36 冲突修改 2019-12-02 11:14:20 +08:00
苏尹岚
3c5afc31b6 接口位置移动,门店归属补漏修改,获取京东用户修改 2019-12-02 11:12:09 +08:00
gazebo
0a42beac8a +GetMyOrderCountInfo 2019-12-02 11:00:57 +08:00
苏尹岚
6c0c837fae 门店归属订单不漏 2019-11-29 17:48:29 +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
苏尹岚
e30808a752 Accept Merge Request #42: (yonghui -> mark)
Merge Request: 查找京东用户
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/42
2019-11-28 14:26:10 +08:00
gazebo
fb758e1211 up 2019-11-28 13:35:20 +08:00
gazebo
4ca1f56cb6 不需要token的API添加可选参数token(以便转入时能输出token信息) 2019-11-28 10:32:54 +08:00
gazebo
412fe44d32 按活动要求强制刷新商品平台价 2019-11-28 08:59:56 +08:00
苏尹岚
bbc9be5503 查找京东商城用户关联的活跃门店 2019-11-28 08:49:53 +08:00
苏尹岚
5cf58c44b0 Merge remote-tracking branch 'origin/mark' into yonghui 2019-11-28 08:37:22 +08:00
gazebo
d836376ac3 fk 2019-11-27 18:02:47 +08:00
gazebo
d6e172f6f9 fk 2019-11-27 17:32:38 +08:00
gazebo
47803c64e4 up 2019-11-27 17:24:21 +08:00
苏尹岚
814795b1f8 Merge remote-tracking branch 'origin/mark' into yonghui 2019-11-27 15:02:37 +08:00
gazebo
1eff6bfd43 QueryPageStores添加radius,lng,lat参数 2019-11-27 14:34:30 +08:00
苏尹岚
491fddf6ed Merge remote-tracking branch 'origin/mark' into yonghui 2019-11-27 10:06:12 +08:00
苏尹岚
3ffb353901 老格拓店恢复 2019-11-27 10:05:57 +08:00
gazebo
7410da75fd +GetOrderPay
GetOrders添加参数isPurchase
2019-11-27 10:05:26 +08:00
gazebo
2d1bfa4c1e +GetAvailableDeliverTime 2019-11-26 16:16:54 +08:00
苏尹岚
a9df406011 获取微盟订单商品信息bug修改 2019-11-26 11:42:20 +08:00
苏尹岚
8eef3288db 获取微盟订单信息 2019-11-26 09:36:46 +08:00
gazebo
f1b3547645 up 2019-11-25 15:22:47 +08:00
gazebo
7a206dd9b9 UpdateUserByMiniInfo中jsCode可选 2019-11-25 15:18:31 +08:00
苏尹岚
228071d00e excel 2019-11-22 19:10:36 +08:00
苏尹岚
ae6ad69d8c yonghuiexcel 2019-11-22 19:08:48 +08:00
苏尹岚
70bf3a70a9 永辉Excel接口修改 2019-11-22 18:03:12 +08:00
gazebo
0416712318 去除临时通过门店账单上传永辉的代码 2019-11-21 11:52:43 +08:00
gazebo
81249ae3b7 京东活动即使创建失败,也记录平台活动ID
删除活动商品时,如果之前是同步失败状态,不调用SyncAct
2019-11-21 11:40:35 +08:00
gazebo
db9e80212f 微信支付退款 2019-11-21 09:20:56 +08:00