Commit Graph

1186 Commits

Author SHA1 Message Date
苏尹岚
d50d796d31 新增支付平台通联宝测试 2020-02-26 15:35:25 +08:00
苏尹岚
65353aa0ca 获取送达时间,如果是预订单门店只能取明后天 2020-02-24 16:25:36 +08:00
苏尹岚
5ee6af40d2 Merge remote-tracking branch 'origin/mark' into su 2020-02-21 14:05:06 +08:00
苏尹岚
f98dae15f9 合并饿鲜达商品库并刷新分类 2020-02-21 13:30:34 +08:00
gazebo
95ad575e09 StoreMap添加DeliveryFeeDeductionSill, DeliveryFeeDeductionFee 2020-02-21 10:26:04 +08:00
苏尹岚
ab744bc6fb 饿鲜达商品库合并 2020-02-20 17:36:39 +08:00
苏尹岚
4ba1cc3c41 newconfig新增类型 2020-02-19 14:46:58 +08:00
苏尹岚
511da0f1a4 Accept Merge Request #190: (su -> mark)
Merge Request: 优化饿鲜达
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/190
2020-02-19 14:35:01 +08:00
苏尹岚
fabed5e239 GetStoresOrderSaleInfo 查询修改 2020-02-19 14:09:49 +08:00
苏尹岚
466d14a23e GetStoresOrderSaleInfo <= 24 小时,按完成时间查询 2020-02-19 13:55:14 +08:00
苏尹岚
776657ed2b getskunames关于饿鲜达参数修改 2020-02-19 11:38:55 +08:00
苏尹岚
78acdfdf19 订单打款查询验证方式增加微信支付appid参数 2020-02-19 09:01:38 +08:00
苏尹岚
6af337d7ac Accept Merge Request #189: (su -> mark)
Merge Request: 饿先达商品分类完善
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/189
2020-02-18 20:35:14 +08:00
gazebo
b935ef3462 将京西菜市名字(及其它一些硬编码)做成配置项目 2020-02-18 19:11:47 +08:00
苏尹岚
fa28f3b30c 饿鲜达部分商品增加默认价格和分类 2020-02-18 10:57:48 +08:00
苏尹岚
94bce18432 饿鲜达分类同步优化 2020-02-17 16:08:44 +08:00
gazebo
a0d5ea8872 SetStoresMapSyncStatus 2020-02-14 20:39:27 +08:00
苏尹岚
871151201e 饿鲜达商品分类id增加,每日打款修改authid 2020-02-14 11:02:09 +08:00
苏尹岚
ba0b726871 日常bug 2020-02-13 18:21:59 +08:00
gazebo
0477de8916 认证支持同一类型多绑定 2020-02-13 16:45:09 +08:00
苏尹岚
f78d71d191 饿鲜达分类查询初尝试 2020-02-13 16:44:21 +08:00
苏尹岚
e46245f7e2 饿鲜达商品库合并修改,每日订单打款增加日志,一些bug 2020-02-13 16:25:54 +08:00
苏尹岚
c461e3e10e 订单打款修改 2020-02-12 17:25:47 +08:00
苏尹岚
ee9ce5a54f 饿鲜达商品库合并测试,订单分账修改 2020-02-12 17:25:45 +08:00
苏尹岚
426aef5f91 饿鲜达商品新建分类处理 2020-02-12 17:25:42 +08:00
苏尹岚
958e0831a6 sql错了 2020-02-12 17:25:42 +08:00
苏尹岚
246d938ae0 饿鲜达创建门店商品优化 2020-02-12 17:25:42 +08:00
gazebo
218ddf418f 推送账单时,推送到主店 2020-02-12 16:35:22 +08:00
gazebo
97a5c2d921 添加Store.OperatorPhone3 2020-02-12 08:40:18 +08:00
苏尹岚
7e4993ae55 实验饿百同步饿鲜达商品 2020-02-11 11:35:48 +08:00
gazebo
527222a095 2020-02-10美团要求下架所有猪肉 2020-02-10 14:57:04 +08:00
suyl
9afb6adfbb Merge remote-tracking branch 'origin/mark' into su 2020-02-07 14:21:22 +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
苏尹岚
8c602871e8 temporay up 2020-02-07 11:46:35 +08:00
gazebo
a26ce01901 取消StoreCourierMap的VendorStoreID唯一限制 2020-02-07 10:19:58 +08:00
gazebo
763fae34df 取消StoreCourierMap的VendorStoreID唯一限制 2020-02-07 10:00:48 +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
a4c395e1a2 GetStatisticsReportForOrders 2020-02-06 10:49:53 +08:00
苏尹岚
9ca394e5c7 推广人不在门店上 2020-02-05 17:27:24 +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
gazebo
b2f7980dc2 up 2020-02-05 14:09:28 +08:00
gazebo
6ee3227a91 GetStatisticsReportForOrders 2020-02-05 14:05:24 +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
f118cd8331 到家商城的订单发通知消息
+Store.LinkStoreID
2020-02-04 16:20:09 +08:00