Commit Graph

4095 Commits

Author SHA1 Message Date
gazebo
41f0d1fa3d up 2019-12-20 11:44:09 +08:00
gazebo
53bd1ecb43 fk 2019-12-20 11:33:17 +08:00
gazebo
015e098a6c 订单打印去掉ActualPayPrice 2019-12-20 11:28:35 +08:00
gazebo
db37338060 up 2019-12-20 11:23:40 +08:00
gazebo
48b6de0a6f +setFakeActualPayPrice 2019-12-20 11:20:02 +08:00
gazebo
163b27ca6e wxpay partner 2019-12-20 11:19:47 +08:00
gazebo
4c698967d0 wxpay to wxpayapi 2019-12-19 16:29:15 +08:00
gazebo
850c35c9d9 调整京西商城支付 2019-12-19 16:20:10 +08:00
gazebo
415cc834fc maxStoreNameBind = 10000 2019-12-19 15:57:18 +08:00
gazebo
84985a73fb 调整单的调试信息 2019-12-19 14:10:45 +08:00
gazebo
9498542e59 修复订单调度定时器的BUG
PickupGoods失败后判断订单状态如果是已经大于拣货完成,则忽略错误
2019-12-19 12:07:15 +08:00
gazebo
1f1036b503 每晚自动同步时,全量同步
用AmendAndPruneStoreStuff替代PruneMissingStoreSkus与AddCreateFlagForJxStoreSku
2019-12-19 09:55:10 +08:00
gazebo
5f1c793a37 mtwm的partner.FuncUpdateStoreSkus改为1 2019-12-19 08:28:44 +08:00
gazebo
2f9df63b10 必要时清除门店商品价格锁定时间 2019-12-18 12:25:29 +08:00
gazebo
af09cf0878 up 2019-12-18 12:06:52 +08:00
gazebo
51217978ba 门店商品添加锁定概念 2019-12-18 11:55:48 +08:00
gazebo
d1cb4a8c8b 饿百输出回调消息 2019-12-18 10:50:14 +08:00
gazebo
9a68b63b5e ebai.onOrderMsg 2019-12-18 10:41:04 +08:00
gazebo
2659c51d91 up 2019-12-18 08:39:02 +08:00
gazebo
fc039600d5 DeleteSkusFromAct添加可选参数types 2019-12-18 08:30:32 +08:00
gazebo
169efcaa92 修改刷新活动结束状态逻辑 2019-12-17 18:24:56 +08:00
gazebo
0cc04cc9d2 +OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel 2019-12-17 18:01:24 +08:00
gazebo
2c69e934f8 限制饿百平台的商家分类名长度 2019-12-17 17:23:46 +08:00
gazebo
b6e8c33012 去除老的sku与category相关多门店平台接口 2019-12-17 16:51:45 +08:00
gazebo
64c7aec3c3 +jd.VenderAuditApplyCancelOrder 2019-12-17 15:55:46 +08:00
gazebo
6e3ee7c9c1 京西商城订单取消 2019-12-17 14:05:43 +08:00
gazebo
d5f2273d79 +dao.LoadPendingOrders 2019-12-17 14:00:01 +08:00
gazebo
d7f9f30178 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-17 11:25:44 +08:00
gazebo
d38582709f act.SyncAct 2019-12-17 11:25:22 +08:00
苏尹岚
81ea19b80a Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-17 10:43:04 +08:00
苏尹岚
57fb6ac078 更新门店公告 2019-12-17 10:42:48 +08:00
gazebo
8d51d77529 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-17 10:07:23 +08:00
gazebo
16b772f13c Merge branch 'master' into mark 2019-12-17 10:07:13 +08:00
gazebo
272462f3eb up 2019-12-17 09:46:56 +08:00
gazebo
9e1ec73200 去除realEarningPrice 2019-12-17 09:35:28 +08:00
苏尹岚
7d944f4ac6 刷新京东门店等级 2019-12-17 09:04:05 +08:00
苏尹岚
f5b7b03044 刷新京东门店等级 2019-12-17 08:57:51 +08:00
苏尹岚
2064cc11f5 刷新京东门店等级 2019-12-17 08:53:07 +08:00
苏尹岚
ac6372888d 刷新京东等级 2019-12-16 18:42:29 +08:00
苏尹岚
c55211fa53 刷新京东等级 2019-12-16 18:40:39 +08:00
苏尹岚
365f69f8fa 刷新京东等级 2019-12-16 18:38:48 +08:00
苏尹岚
6afbfb156a 刷新京东等级 2019-12-16 18:32:32 +08:00
gazebo
b985b1a907 fk 2019-12-16 18:27:35 +08:00
gazebo
a0fee1f756 fk 2019-12-16 18:21:16 +08:00
苏尹岚
f6c1b70484 Accept Merge Request #91: (yonghui -> mark)
Merge Request: 推荐分类
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/91
2019-12-16 18:08:02 +08:00
gazebo
b0cd64a358 +store/sku/GetStoreCategories 2019-12-16 18:05:26 +08:00
苏尹岚
c65032474e Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-16 16:52:54 +08:00
苏尹岚
be0bcf63f4 根据名字查询京东upc 2019-12-16 16:52:34 +08:00
gazebo
7296b5cca3 GetEffectiveActStoreSkuInfo, ActTypeAll 2019-12-16 16:46:05 +08:00
gazebo
84f2c8930c GetEffectiveActStoreSkuInfo添加actType参数
修复ActStoreSkuParam2Model中调用GetEffectiveActStoreSkuInfo的bug
2019-12-16 16:39:39 +08:00