苏尹岚
|
7305f1a6af
|
定时更改商品可售状态
|
2019-11-15 09:47:10 +08:00 |
|
苏尹岚
|
bcc534289a
|
定时刷新商品可售状态
|
2019-11-14 18:03:34 +08:00 |
|
gazebo
|
1de4525ff6
|
up
|
2019-11-14 16:24:49 +08:00 |
|
gazebo
|
9a67c62892
|
商家分类重排序后，没有正确处理单门店平台的同步逻辑修复
|
2019-11-14 16:14:56 +08:00 |
|
苏尹岚
|
3da95b29f8
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-14 11:45:32 +08:00 |
|
苏尹岚
|
e15e7ed9e2
|
定时修改商品可售状态
|
2019-11-14 11:45:16 +08:00 |
|
苏尹岚
|
32eb1a6dbe
|
读取永辉Excel
|
2019-11-13 18:18:12 +08:00 |
|
苏尹岚
|
8df7f897fa
|
读取永辉Excel
|
2019-11-13 18:11:58 +08:00 |
|
苏尹岚
|
705aa5153c
|
读取永辉Excel
|
2019-11-13 17:06:18 +08:00 |
|
gazebo
|
ae5a923d38
|
GetStoreSkus添加参数：actVendorID表示要取哪个平台的活动信息
|
2019-11-13 16:25:44 +08:00 |
|
gazebo
|
7f231d1f6a
|
StoreSkuBind添加JxPrice
|
2019-11-13 15:16:11 +08:00 |
|
苏尹岚
|
3c46efe89d
|
读取永辉Excel
|
2019-11-13 09:59:20 +08:00 |
|
苏尹岚
|
95c37a847e
|
读取永辉Excel文件
|
2019-11-13 09:57:20 +08:00 |
|
苏尹岚
|
d40182a220
|
读取excel文件
|
2019-11-13 08:15:37 +08:00 |
|
苏尹岚
|
a1efff61a4
|
读取永辉excel
|
2019-11-12 18:06:35 +08:00 |
|
苏尹岚
|
73a16aac04
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-12 17:52:12 +08:00 |
|
gazebo
|
a2a5ae7e50
|
修改结算活动时，不应该设置同步标志
|
2019-11-12 11:12:56 +08:00 |
|
gazebo
|
d96f50058f
|
修复取消结算活动时的bug
|
2019-11-12 11:00:25 +08:00 |
|
gazebo
|
89e39071e8
|
GetStoreListByLocation返回营业时间及门店状态
|
2019-11-12 10:32:53 +08:00 |
|
gazebo
|
ef5e755544
|
TmpGetJxBadComments添加可选参数keyword
|
2019-11-11 17:33:19 +08:00 |
|
gazebo
|
88b0241955
|
up
|
2019-11-11 14:36:14 +08:00 |
|
gazebo
|
f710444cbf
|
Store.ChangePriceType新增StoreChangePriceTypeManagedStore
|
2019-11-11 10:11:43 +08:00 |
|
苏尹岚
|
25ca7ed92f
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-11 09:52:12 +08:00 |
|
苏尹岚
|
9de07d2ea1
|
读取永辉excel文件
|
2019-11-11 09:51:10 +08:00 |
|
gazebo
|
83f9493352
|
价格包参数添加priceAdd
|
2019-11-11 09:20:14 +08:00 |
|
gazebo
|
6a37def14f
|
store_check.GetAllStoreSkus中添加调试，查找GetStoreSkus返回空的问题
|
2019-11-10 23:08:31 +08:00 |
|
gazebo
|
a7164bb511
|
添加User.Avatar
|
2019-11-08 17:32:46 +08:00 |
|
徐建华
|
29e6559e17
|
Accept Merge Request #22: (su -> mark)
Merge Request: 刷新历史订单结算价
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/22
|
2019-11-08 15:35:41 +08:00 |
|
gazebo
|
7d230ecf1e
|
修复删除饿百活动商品失败的bug
在删除门店商品失败时，尝试设置不可售
|
2019-11-08 15:24:51 +08:00 |
|
苏尹岚
|
29c92a0f12
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-08 15:23:28 +08:00 |
|
gazebo
|
c5a01f1e9b
|
重构CalculateOrderDeliveryFee与QueryUserDeliveryAddress
|
2019-11-08 14:28:34 +08:00 |
|
苏尹岚
|
622d53cb4e
|
修改
|
2019-11-08 12:02:11 +08:00 |
|
苏尹岚
|
b417b731ff
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-08 11:54:21 +08:00 |
|
苏尹岚
|
0854c131cb
|
刷新历史订单结算价修改
|
2019-11-08 11:54:06 +08:00 |
|
gazebo
|
ae8b6a32c1
|
京东到家活动消息回调时，避免创建重复的活动
|
2019-11-08 09:39:43 +08:00 |
|
gazebo
|
f85c182f44
|
禁用与不同步的门店创建活动时排除
|
2019-11-08 09:01:59 +08:00 |
|
gazebo
|
025ead8c05
|
活动平台价直接使用当前存的，不重新计算
不同步的门店或禁用的门店不创建活动
|
2019-11-07 23:00:48 +08:00 |
|
苏尹岚
|
2339761b98
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-07 16:55:06 +08:00 |
|
gazebo
|
5d6e531058
|
修复计算活动比例的舍入误差
|
2019-11-07 15:45:10 +08:00 |
|
苏尹岚
|
ba2d403c73
|
对比程序修改
|
2019-11-07 09:14:56 +08:00 |
|
苏尹岚
|
8634f34ac5
|
对比差异程序修改
|
2019-11-07 08:55:37 +08:00 |
|
苏尹岚
|
5af2a702ed
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-07 08:55:09 +08:00 |
|
gazebo
|
0ca50bec4c
|
GetStores精简模式下清除图片相关的信息
|
2019-11-07 08:52:00 +08:00 |
|
苏尹岚
|
c0f51a08aa
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-07 08:50:53 +08:00 |
|
苏尹岚
|
1edba57a60
|
对比差异测试
|
2019-11-07 08:14:36 +08:00 |
|
gazebo
|
aa4a24f1b6
|
修复getStoresSql中错用storeIDs的bug
|
2019-11-06 18:48:00 +08:00 |
|
gazebo
|
d7360648ec
|
GetStores添加可选参数：briefLevel
|
2019-11-06 18:32:37 +08:00 |
|
gazebo
|
5015620015
|
+IsVendorRemote
|
2019-11-06 16:57:22 +08:00 |
|
gazebo
|
dc7d712ff6
|
up
|
2019-11-06 10:10:37 +08:00 |
|
gazebo
|
49a4b7b069
|
添加user2/GetSelfInfo
|
2019-11-06 10:00:36 +08:00 |
|