Commit Graph

4971 Commits

Author SHA1 Message Date
苏尹岚
a2ffd1610a 价格统计优化 2020-02-10 10:04:50 +08:00
苏尹岚
7338ca0999 价格统计优化 2020-02-10 09:23:33 +08:00
苏尹岚
7ba8a762fd Accept Merge Request #183: (su -> mark)
Merge Request: 根据京东建议售价修改京西价
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/183
2020-02-09 19:37:49 +08:00
gazebo
f73a97fc6b courierstore status 2020-02-09 12:03:04 +08:00
gazebo
c42bb64998 SendStoreMessage数量少时任务不管理 2020-02-07 20:15:19 +08:00
suyl
7c2b986fa8 根据平台价刷新惊喜价 2020-02-07 15:49:02 +08:00
suyl
73a01664ce Merge remote-tracking branch 'origin/mark' into su 2020-02-07 15:38:27 +08:00
gazebo
464399e145 up 2020-02-07 14:55:47 +08:00
suyl
9afb6adfbb Merge remote-tracking branch 'origin/mark' into su 2020-02-07 14:21:22 +08:00
gazebo
fbdd8849f6 CaculateJxPriceByPricePack 2020-02-07 14:20:24 +08:00
suyl
9d203c90e7 Merge remote-tracking branch 'origin/mark' into su 2020-02-07 13:49:20 +08:00
gazebo
1855af8757 GetStoreOrderSkuList以订单完成时间为准 2020-02-07 13:48:36 +08:00
gazebo
8d0df4128d OnNewFakeJdOrder中调用RefreshOrderSkuRelated 2020-02-07 12:52:16 +08:00
苏尹岚
8c602871e8 temporay up 2020-02-07 11:46:35 +08:00
gazebo
1b8d792a2c 达达配送用新接口 2020-02-07 11:27:03 +08:00
gazebo
a26ce01901 取消StoreCourierMap的VendorStoreID唯一限制 2020-02-07 10:19:58 +08:00
gazebo
70a3f59026 京西商城自动配送调度只使用达达 2020-02-07 10:17:57 +08:00
gazebo
763fae34df 取消StoreCourierMap的VendorStoreID唯一限制 2020-02-07 10:00:48 +08:00
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