Commit Graph

4953 Commits

Author SHA1 Message Date
gazebo
811ddc82b3 获取门店信息时,特殊处理江阴这种县级市 2020-02-07 09:38:25 +08:00
苏尹岚
73a76834cd Accept Merge Request #182: (su -> mark)
Merge Request: 修改门店敏感字段权限增加赵
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/182
2020-02-06 17:47:08 +08:00
苏尹岚
96f2734c19 修改门店权限增加赵 2020-02-06 17:45:59 +08:00
gazebo
b864b0983d 打印机调试信息 2020-02-06 17:36:20 +08:00
gazebo
3d2c8f4222 打印依赖LinkStoreID 2020-02-06 17:32:44 +08:00
gazebo
80fc4ce6a9 up 2020-02-06 16:46:40 +08:00
gazebo
ab77e0d220 GetStoreAfsOrderSkuList中多次退同一订单的情况处理 2020-02-06 16:32:29 +08:00
gazebo
3e48f82de5 wxpay 2020-02-06 15:56:08 +08:00
苏尹岚
a948f71220 Accept Merge Request #181: (su -> mark)
Merge Request: 投诉骑手订单完成放开
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/181
2020-02-06 14:27:51 +08:00
苏尹岚
0807497a42 投诉骑手要求订单完成放开 2020-02-06 14:05:50 +08:00
gazebo
a4c395e1a2 GetStatisticsReportForOrders 2020-02-06 10:49:53 +08:00
苏尹岚
8020feae80 Accept Merge Request #180: (su -> mark)
Merge Request: appconf微信payAppid修改为小程序的
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/180
2020-02-05 17:27:45 +08:00
苏尹岚
9ca394e5c7 推广人不在门店上 2020-02-05 17:27:24 +08:00
苏尹岚
e9f59f91bf 微信payAppid改为小程序 2020-02-05 17:25:39 +08:00
gazebo
a1d6c807c5 后天 2020-02-05 17:13:09 +08:00
gazebo
11f63d6fd4 京西商城配送时间范围添加后天 2020-02-05 17:09:29 +08:00
gazebo
56dc17a5af GetStoreOrderAfterTime考虑待支持订单 2020-02-05 16:09:18 +08:00
苏尹岚
3c786ba128 store字段修改 2020-02-05 15:49:03 +08:00
苏尹岚
7663de1287 store加市场负责人 2020-02-05 15:41:54 +08:00
gazebo
dbcfd0be91 GetStoreListByMobileOrStoreIDs查tel1,tel2 2020-02-05 15:26:30 +08:00
苏尹岚
4442222212 Accept Merge Request #179: (su -> mark)
Merge Request: 运营可修改市场负责人电话和组字段
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/179
2020-02-05 14:40:26 +08:00
苏尹岚
52fbbb020b 运营权限修改,可修改市场负责人电话和组 2020-02-05 14:39:26 +08:00
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