gazebo
|
dabbfc1dd6
|
up
|
2019-12-03 11:57:27 +08:00 |
|
gazebo
|
38046bbe24
|
尽量减少对于api.JdAPI的直接依赖
|
2019-12-03 11:21:54 +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 |
|
gazebo
|
358e3eea1e
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-20 16:04:29 +08:00 |
|
gazebo
|
1195e194a1
|
+Pay4Order
|
2019-11-20 15:55:09 +08:00 |
|
苏尹岚
|
0e481ffe72
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-20 09:55:42 +08:00 |
|
gazebo
|
ea49b20528
|
InitVendorCategory中改用批量插入
|
2019-11-20 09:41:00 +08:00 |
|
苏尹岚
|
74dfe66326
|
读取永辉excel
|
2019-11-18 16:56:18 +08:00 |
|
gazebo
|
d0d5e1752d
|
临时将发送门店账单用作上传永辉价格表
|
2019-11-17 13:27:55 +08:00 |
|
gazebo
|
30167d627a
|
京西商城订单可以创建
|
2019-11-15 22:01:30 +08:00 |
|
苏尹岚
|
3da95b29f8
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-14 11:45:32 +08:00 |
|
gazebo
|
ae5a923d38
|
GetStoreSkus添加参数：actVendorID表示要取哪个平台的活动信息
|
2019-11-13 16:25:44 +08:00 |
|
苏尹岚
|
95c37a847e
|
读取永辉Excel文件
|
2019-11-13 09:57:20 +08:00 |
|
苏尹岚
|
be69ca429c
|
读取excel
|
2019-11-13 08:19:50 +08:00 |
|
苏尹岚
|
d40182a220
|
读取excel文件
|
2019-11-13 08:15:37 +08:00 |
|
苏尹岚
|
c39acd3d4f
|
时间缺省值修改
|
2019-11-12 18:30:06 +08:00 |
|
苏尹岚
|
6eabd6b488
|
读取excle
|
2019-11-12 18:22:00 +08:00 |
|
苏尹岚
|
a1efff61a4
|
读取永辉excel
|
2019-11-12 18:06:35 +08:00 |
|
苏尹岚
|
73a16aac04
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-12 17:52:12 +08:00 |
|