Commit Graph

320 Commits

Author SHA1 Message Date
苏尹岚
cda6d91dae Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-09 10:32:28 +08:00
苏尹岚
8f7e1fd1bb 操作日志 2020-01-09 08:31:44 +08:00
gazebo
27e13ecb99 fk 2020-01-08 18:40:39 +08:00
gazebo
ce41890da7 alipayAppID 2020-01-08 18:36:55 +08:00
gazebo
c196e7aab9 添加支付宝登录方式:alipaycode 2020-01-08 18:06:53 +08:00
gazebo
772c8f9cbe StoreSkuAct 2020-01-06 18:00:14 +08:00
苏尹岚
0f2058de84 自动关注 2019-12-31 13:31:29 +08:00
苏尹岚
b068d07c33 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-27 17:52:23 +08:00
苏尹岚
cfb1a2e052 差评补款 2019-12-26 18:36:58 +08:00
gazebo
381d1b2f21 调整加订单配送小费逻辑,添加美团外卖平台支持 2019-12-26 16:19:04 +08:00
gazebo
44a0caade0 关闭输日志 2019-12-26 08:42:53 +08:00
gazebo
e8352cd412 fk 2019-12-24 09:27:01 +08:00
gazebo
01247221c4 SkuName.Upc改为*string(以支持null及添加唯一索引) 2019-12-23 16:15:58 +08:00
苏尹岚
d1d49d464e 商品前缀名 2019-12-20 10:00:13 +08:00
gazebo
4c698967d0 wxpay to wxpayapi 2019-12-19 16:29:15 +08:00
gazebo
b7ca827ca7 去除getAPI("")调用,没有vendorOrgCode时报警 2019-12-13 10:59:21 +08:00
gazebo
2ddd16460a GetSkusWithVendor中取商品城市的bug修复 2019-12-13 10:47:58 +08:00
gazebo
248a9299ce GetSkusWithVendor,GetSkuCategoryWithVendor
apimanager的bug修改
2019-12-12 10:59:55 +08:00
gazebo
29bc986e45 jd2配置
SyncSkuNames
SyncCategorys
2019-12-12 09:18:44 +08:00
gazebo
31704041a8 alpha环境启用isUseThingMap 2019-12-11 09:07:32 +08:00
苏尹岚
7cbce85665 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-10 11:48:18 +08:00
苏尹岚
62569dfe55 导入Excel更新京西价,推荐商品 2019-12-10 11:47:52 +08:00
gazebo
ade9a674f4 +GetVendorOrgCodeInfo 2019-12-10 09:59:29 +08:00
gazebo
ecedbe9be4 京东api区分vendorOrgCode 2019-12-09 15:16:21 +08:00
suyl
4caf019e70 门店价格插叙 2019-12-07 20:26:52 +08:00
gazebo
039f87c8dc !!!门店相关的API全部添加vendorOrgCode依赖 2019-12-06 17:20:55 +08:00
苏尹岚
c6abdbbd3e 价格参考 2019-12-06 09:04:55 +08:00
gazebo
33f38552d4 注册表:OrderPayRefund 2019-12-05 11:45:32 +08:00
gazebo
e742d88efd 加入ThingMap表示商品库的同步信息 2019-12-05 09:04:23 +08:00
gazebo
2635fb035a +ThingMap
+OnxxThing
2019-12-04 10:57:31 +08:00
gazebo
55fdde9be2 LoopMultiStoresVendors引入OrgCode 2019-12-03 18:27:53 +08:00
gazebo
84dac23be8 京东回调消息根据token动态选择不同的配置 2019-12-03 15:07:50 +08:00
gazebo
cea72b06de SetJdCookie 2019-11-27 14:56:47 +08:00
gazebo
7c5e411f8b +微信支付证书 2019-11-21 09:51:13 +08:00
gazebo
db9e80212f 微信支付退款 2019-11-21 09:20:56 +08:00
gazebo
75caa1fffd 处理UpdateStore时,传入autoEnableAt引起的crash 2019-11-20 22:21:35 +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
苏尹岚
a1e834a0bc 时间校验修改 2019-11-18 14:41:56 +08:00
苏尹岚
528f58ce4e 修改refutil 2019-11-18 10:11:18 +08:00
苏尹岚
b31adda4d5 商品可售时间设置校验 2019-11-18 09:37:52 +08:00
gazebo
e587723cf5 +GetWeimobToken 2019-10-31 11:10:59 +08:00
gazebo
6d307d9150 RefreshYilianyunToken 2019-10-30 16:19:26 +08:00
gazebo
d24b8ea53d 添加用户购买车加载与存储操作 2019-10-21 14:17:30 +08:00
gazebo
2483b33dc1 添加用户配送地址管理API 2019-10-17 13:54:32 +08:00
Rosy-zhudan
1ef5d248e8 门店红线/黄线统计-写入数据库 2019-09-29 18:32:55 +08:00
gazebo
412b11396a - 注释掉老user与auth相关的代码 2019-09-24 16:39:50 +08:00
gazebo
f4b6516b4d + 添加数据资源操作相关的API 2019-09-17 16:02:44 +08:00
xujianhua
9c7ae16186 Accept Merge Request #3: (don -> mark)
Merge Request: 门店评分
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/3
2019-09-17 11:12:33 +08:00
gazebo
312ce745cc - 菜谱相关 2019-09-16 18:40:43 +08:00