Commit Graph

4901 Commits

Author SHA1 Message Date
gazebo
ddf419a8ab fk 2020-02-04 10:27:56 +08:00
苏尹岚
e4dbfbe727 Accept Merge Request #173: (su -> mark)
Merge Request: 商城推荐商品取京西活动价
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/173
2020-02-04 10:24:07 +08:00
gazebo
37d6458cb8 保留isSync,不允许改为0 2020-02-04 10:21:18 +08:00
gazebo
71638faaab 暂时禁用isSync 2020-02-04 10:21:18 +08:00
gazebo
077cf1ba2b ProfitSharing=Y 2020-02-04 10:21:18 +08:00
gazebo
72db973e8b 去掉ProxySNSxx函数,添加getWxApp 2020-02-04 10:21:18 +08:00
gazebo
c1c7dd1d33 京东,饿百不同步配送范围 2020-02-04 10:21:18 +08:00
gazebo
aed8dffa43 饿百菜市门店名从京西菜市改为饿鲜达 2020-02-04 10:21:18 +08:00
gazebo
1bd36385f9 忽略饿百同步错误201101 2020-02-04 10:21:18 +08:00
gazebo
a3f93c3a96 model.ActCreateTypeAPI 2020-02-04 10:21:18 +08:00
gazebo
e0a5710e7d comment 2020-02-04 10:21:18 +08:00
苏尹岚
92cd70f7e2 商城推荐商品取京西活动价 2020-02-04 10:20:16 +08:00
gazebo
ec9594268f 保留isSync,不允许改为0 2020-02-04 10:19:06 +08:00
gazebo
a96efa96af 暂时禁用isSync 2020-02-04 09:55:53 +08:00
gazebo
69759189e8 ProfitSharing=Y 2020-02-04 09:25:17 +08:00
苏尹岚
6199123a9b Accept Merge Request #172: (su -> mark)
Merge Request: 复制门店商品删除未关注
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/172
2020-02-04 09:16:42 +08:00
苏尹岚
cefdf15082 错误信息超长 2020-02-04 09:15:40 +08:00
gazebo
f10b9b3b00 去掉ProxySNSxx函数,添加getWxApp 2020-02-04 08:46:21 +08:00
gazebo
833b7bcbed 京东,饿百不同步配送范围 2020-02-03 20:56:49 +08:00
苏尹岚
beef010f4c 复制门店商品操作日志增加比例 2020-02-03 18:12:00 +08:00
苏尹岚
1fa3eef48f 去掉操作日志中的token 2020-02-03 17:53:04 +08:00
gazebo
ca30a0cd0d 饿百菜市门店名从京西菜市改为饿鲜达 2020-02-03 17:42:16 +08:00
苏尹岚
f88900e869 复制门店商品删除未关注数据 2020-02-03 17:16:31 +08:00
苏尹岚
a158558609 Accept Merge Request #171: (su -> mark)
Merge Request: 操作日志增加错误相关,通错误返回平台名
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/171
2020-02-03 14:15:55 +08:00
苏尹岚
1645dda5d4 操作日志查询修改 2020-02-03 13:34:13 +08:00
苏尹岚
ee27ef9519 操作日志查询修改 2020-02-03 11:57:04 +08:00
苏尹岚
4439135bbd 操作日志查询增加错误,关键字,同步错误返回显示平台名 2020-02-03 11:49:14 +08:00
gazebo
6f62dcfe30 忽略饿百同步错误201101 2020-02-03 11:31:25 +08:00
gazebo
c1f156f79a model.ActCreateTypeAPI 2020-02-03 10:21:53 +08:00
苏尹岚
d7bcd32d87 Accept Merge Request #170: (su -> mark)
Merge Request: 报警汇总,同步错误返回修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/170
2020-02-03 09:36:32 +08:00
苏尹岚
daabd0ed3f 操作日志查询无记录时不查询detail 2020-02-03 09:19:15 +08:00
gazebo
919e866cb3 UpdateUserByMiniInfo以微信信息更新手机号时,如果手机号重复,报错 2020-02-02 10:17:14 +08:00
gazebo
0d650cf82b UpdateUserByMiniInfo中UpdateEntity返回错误 2020-02-01 20:38:24 +08:00
gazebo
a7bc749ff0 Login兼容没有取到authid2的错误 2020-02-01 18:54:10 +08:00
gazebo
08ebdfe26d GetStoreListByLocation将营业门店排在前面,缺省至少返回一个门店(为了腾讯审核用) 2020-02-01 15:51:17 +08:00
gazebo
0c5d62e55f 京西商城订单序号 2020-02-01 12:23:15 +08:00
gazebo
c2519be865 自配送门店也要检查isDeliveryCompetition 2020-02-01 12:09:54 +08:00
gazebo
c0792ddfb3 up 2020-02-01 11:08:46 +08:00
gazebo
320c23ae8a up 2020-02-01 11:03:12 +08:00
gazebo
51af8622dd ?AddMyDeliveryAddress 2020-02-01 10:52:01 +08:00
gazebo
06c97665ed 京西商城100274免配送费 2020-01-31 23:05:44 +08:00
gazebo
98825dada0 美团取消投诉也当成取消申请取消 2020-01-31 19:38:57 +08:00
gazebo
1282ce1b4d 限制status.Remark长度 2020-01-29 11:07:10 +08:00
gazebo
4bf6896a3a 售后或差评时,更新订单隐私号 2020-01-29 10:39:08 +08:00
gazebo
7d77374f6c 门店评分任务从22:00改到23:00 2020-01-28 12:13:10 +08:00
苏尹岚
ded473c57b 每天的同步错误发给我自己 2020-01-22 10:26:48 +08:00
苏尹岚
04d9cd0d33 京东同步错误返回修改 2020-01-22 09:47:19 +08:00
苏尹岚
313e0616fe 同步错误返回优化 2020-01-21 18:30:17 +08:00
苏尹岚
85a2e42ea6 同步错误返回,修改 2020-01-21 18:18:49 +08:00
gazebo
092655103a comment 2020-01-21 17:46:39 +08:00