liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • b864b0983d 打印机调试信息 gazebo 2020-02-06 17:36:20 +08:00
  • 3d2c8f4222 打印依赖LinkStoreID gazebo 2020-02-06 17:32:44 +08:00
  • 80fc4ce6a9 up gazebo 2020-02-06 16:46:40 +08:00
  • ab77e0d220 GetStoreAfsOrderSkuList中多次退同一订单的情况处理 gazebo 2020-02-06 16:32:29 +08:00
  • 3e48f82de5 wxpay gazebo 2020-02-06 15:55:48 +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
  • a4c395e1a2 GetStatisticsReportForOrders gazebo 2020-02-06 10:48:48 +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
  • a1d6c807c5 后天 gazebo 2020-02-05 17:13:09 +08:00
  • 11f63d6fd4 京西商城配送时间范围添加后天 gazebo 2020-02-05 17:09:29 +08:00
  • 56dc17a5af GetStoreOrderAfterTime考虑待支持订单 gazebo 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
  • dbcfd0be91 GetStoreListByMobileOrStoreIDs查tel1,tel2 gazebo 2020-02-05 15:24:04 +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
  • 3da2c161be 先不区分商户与消息者 gazebo 2020-02-05 14:21:33 +08:00
  • b2f7980dc2 up gazebo 2020-02-05 14:09:28 +08:00
  • 6ee3227a91 GetStatisticsReportForOrders gazebo 2020-02-05 14:05:24 +08:00
  • 5c033903bf 门店查询关键字支持linkStoreID gazebo 2020-02-05 13:42:28 +08:00
  • 5a0a56e9b1 门店禁止自我关联 gazebo 2020-02-05 12:03:13 +08:00
  • a600391ca1 fk gazebo 2020-02-05 11:59:08 +08:00
  • dd5cd8bae7 checkStoreHaveLinkedStore gazebo 2020-02-05 11:47:39 +08:00
  • bd863c2bf1 linkStoreCount gazebo 2020-02-05 10:57:08 +08:00
  • b8cd1b9e3f remove comment gazebo 2020-02-05 10:40:41 +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
  • 2ea4f30326 打印到家订单 gazebo 2020-02-05 10:16:07 +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
  • 21c4ead973 copy暂时屏蔽一段 suyl 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
  • f118cd8331 到家商城的订单发通知消息 +Store.LinkStoreID gazebo 2020-02-04 16:20:09 +08:00
  • 5074a053cd up gazebo 2020-02-04 14:26:13 +08:00
  • 24506a22f9 SyncQualify gazebo 2020-02-04 14:20:04 +08:00
  • c583f910aa 同步错误返回修改 苏尹岚 2020-02-04 14:30:17 +08:00
  • b76404d31d up gazebo 2020-02-04 14:26:13 +08:00
  • 01aa502c45 SyncQualify gazebo 2020-02-04 14:20:04 +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
  • 9aba03a6dc SetStoresMapSyncStatus gazebo 2020-02-04 10:46:16 +08:00
  • ddf419a8ab fk gazebo 2020-02-04 10:27:44 +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
  • 37d6458cb8 保留isSync，不允许改为0 gazebo 2020-02-04 10:19:06 +08:00
  • 71638faaab 暂时禁用isSync gazebo 2020-02-04 09:55:53 +08:00
  • 077cf1ba2b ProfitSharing=Y gazebo 2020-02-04 09:24:56 +08:00
  • 72db973e8b 去掉ProxySNSxx函数，添加getWxApp gazebo 2020-02-04 08:41:55 +08:00
  • c1c7dd1d33 京东，饿百不同步配送范围 gazebo 2020-02-03 20:56:49 +08:00
  • aed8dffa43 饿百菜市门店名从京西菜市改为饿鲜达 gazebo 2020-02-03 17:41:30 +08:00
  • 1bd36385f9 忽略饿百同步错误201101 gazebo 2020-02-03 11:31:25 +08:00
  • a3f93c3a96 model.ActCreateTypeAPI gazebo 2020-01-22 12:20:15 +08:00
  • e0a5710e7d comment gazebo 2020-01-21 17:46:39 +08:00
  • 92cd70f7e2 商城推荐商品取京西活动价 苏尹岚 2020-02-04 10:20:16 +08:00
  • ec9594268f 保留isSync，不允许改为0 gazebo 2020-02-04 10:19:06 +08:00
  • a96efa96af 暂时禁用isSync gazebo 2020-02-04 09:55:53 +08:00
  • 69759189e8 ProfitSharing=Y gazebo 2020-02-04 09:24:56 +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
  • f10b9b3b00 去掉ProxySNSxx函数，添加getWxApp gazebo 2020-02-04 08:41:55 +08:00
  • 833b7bcbed 京东，饿百不同步配送范围 gazebo 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
  • ca30a0cd0d 饿百菜市门店名从京西菜市改为饿鲜达 gazebo 2020-02-03 17:41:30 +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
  • 6f62dcfe30 忽略饿百同步错误201101 gazebo 2020-02-03 11:31:25 +08:00
  • c1f156f79a model.ActCreateTypeAPI gazebo 2020-01-22 12:20:15 +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:06:24 +08:00
  • 919e866cb3 UpdateUserByMiniInfo以微信信息更新手机号时，如果手机号重复，报错 gazebo 2020-02-02 10:17:14 +08:00
  • 0d650cf82b UpdateUserByMiniInfo中UpdateEntity返回错误 gazebo 2020-02-01 20:38:24 +08:00
  • a7bc749ff0 Login兼容没有取到authid2的错误 gazebo 2020-02-01 18:54:10 +08:00
  • 08ebdfe26d GetStoreListByLocation将营业门店排在前面，缺省至少返回一个门店（为了腾讯审核用） gazebo 2020-02-01 15:51:17 +08:00
  • 0c5d62e55f 京西商城订单序号 gazebo 2020-02-01 12:23:15 +08:00
  • c2519be865 自配送门店也要检查isDeliveryCompetition gazebo 2020-02-01 12:09:54 +08:00
  • c0792ddfb3 up gazebo 2020-02-01 11:08:46 +08:00
  • 320c23ae8a up gazebo 2020-02-01 11:03:12 +08:00
  • 51af8622dd ?AddMyDeliveryAddress gazebo 2020-02-01 10:52:01 +08:00
  • 06c97665ed 京西商城100274免配送费 gazebo 2020-01-31 23:05:44 +08:00
  • 98825dada0 美团取消投诉也当成取消申请取消 gazebo 2020-01-31 19:38:57 +08:00
  • 1282ce1b4d 限制status.Remark长度 gazebo 2020-01-29 11:07:10 +08:00
  • 4bf6896a3a 售后或差评时，更新订单隐私号 gazebo 2020-01-29 10:39:08 +08:00
  • 7d77374f6c 门店评分任务从22:00改到23:00 gazebo 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
  • 092655103a comment gazebo 2020-01-21 17:46:39 +08:00
  • 35f1a12a16 冲突 苏尹岚 2020-01-21 17:45:59 +08:00