Commit Graph

4931 Commits

Author SHA1 Message Date
gazebo
3da2c161be 先不区分商户与消息者 2020-02-05 14:21:33 +08:00
gazebo
b2f7980dc2 up 2020-02-05 14:09:28 +08:00
gazebo
6ee3227a91 GetStatisticsReportForOrders 2020-02-05 14:05:24 +08:00
gazebo
5c033903bf 门店查询关键字支持linkStoreID 2020-02-05 13:42:28 +08:00
gazebo
5a0a56e9b1 门店禁止自我关联 2020-02-05 12:03:13 +08:00
gazebo
a600391ca1 fk 2020-02-05 11:59:08 +08:00
gazebo
dd5cd8bae7 checkStoreHaveLinkedStore 2020-02-05 11:47:39 +08:00
gazebo
bd863c2bf1 linkStoreCount 2020-02-05 10:58:20 +08:00
gazebo
b8cd1b9e3f remove comment 2020-02-05 10:58:20 +08:00
苏尹岚
1dd3500e56 Accept Merge Request #178: (su -> mark)
Merge Request: copy商品delete语句去掉别名,mysql5.版本不支持
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/178
2020-02-05 10:20:26 +08:00
苏尹岚
a5f677d2b2 copy商品delete语句去掉别名,mysql5.版本不支持 2020-02-05 10:19:46 +08:00
gazebo
2ea4f30326 打印到家订单 2020-02-05 10:16:34 +08:00
苏尹岚
5659eaa847 copy商品测试sql 2020-02-05 09:36:00 +08:00
苏尹岚
6833d986fe copy商品sql测试 2020-02-05 09:30:34 +08:00
苏尹岚
1399d9530d copy商品 2020-02-05 09:24:22 +08:00
suyl
21c4ead973 copy暂时屏蔽一段 2020-02-04 23:06:10 +08:00
苏尹岚
2e4900f4d4 Accept Merge Request #176: (su -> mark)
Merge Request: appconfg 微信支付appid修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/176
2020-02-04 18:34:26 +08:00
苏尹岚
1da59b408c appconf微信支付appid修改 2020-02-04 18:33:29 +08:00
苏尹岚
39b3823033 Accept Merge Request #175: (su -> mark)
Merge Request: 同步错误返回
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/175
2020-02-04 17:03:31 +08:00
gazebo
f118cd8331 到家商城的订单发通知消息
+Store.LinkStoreID
2020-02-04 16:20:09 +08:00
gazebo
5074a053cd up 2020-02-04 14:31:13 +08:00
gazebo
24506a22f9 SyncQualify 2020-02-04 14:31:13 +08:00
苏尹岚
c583f910aa 同步错误返回修改 2020-02-04 14:30:17 +08:00
gazebo
b76404d31d up 2020-02-04 14:26:13 +08:00
gazebo
01aa502c45 SyncQualify 2020-02-04 14:21:08 +08:00
苏尹岚
924d25d765 同步错误返回。无错误要返回一个完成 2020-02-04 14:09:16 +08:00
苏尹岚
34ae5e2ce6 同步错误返回 2020-02-04 13:47:30 +08:00
苏尹岚
1e20a052c9 Accept Merge Request #174: (su -> mark)
Merge Request: 同步错误返回修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/174
2020-02-04 13:43:11 +08:00
苏尹岚
06055ebac2 同步错误返回修改 2020-02-04 13:42:21 +08:00
gazebo
9aba03a6dc SetStoresMapSyncStatus 2020-02-04 10:46:16 +08:00
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