Commit Graph

361 Commits

Author SHA1 Message Date
gazebo
f20added92 - OrderTypeName 4 OrderTypeAfsOrder 2019-05-09 20:55:44 +08:00
gazebo
e9b85a6ce6 - OrderTypeAfsOrder 2019-05-09 20:43:54 +08:00
gazebo
07f0a00cd7 - 把售后单状态当成订单状态 2019-05-09 20:39:30 +08:00
gazebo
9d2a8f2ffc - 京东售后单填充所有信息 2019-05-09 20:35:51 +08:00
gazebo
af947c058f - up 2019-05-09 17:48:21 +08:00
gazebo
b13441dd53 - 将OrderSkuFinancial中AfsOrderID字段名从order_financial_id改为afs_order_id 2019-05-09 17:39:14 +08:00
gazebo
9c063850ee - make AfsOrder.AfsFinishedAt nullable 2019-05-09 17:25:50 +08:00
gazebo
d4351282cc - 京东售后单第一版 2019-05-09 17:22:30 +08:00
gazebo
709fd6231a - RefreshMissingDadaStores检查城市码和区码 2019-05-09 14:59:44 +08:00
gazebo
4222d41cc1 - 修复StoreDetail2字段描述错误 2019-05-09 14:39:37 +08:00
gazebo
618dcb9c66 - StoreSkuCategoryMap相关 2019-05-09 11:43:00 +08:00
gazebo
eeb91c0724 - 添加空JD回调消息 2019-05-08 21:49:48 +08:00
gazebo
f1e90240dc - skuname添加京东到家平台商品类别,以便于更灵活的指定商品的京东到家商品类别 2019-05-08 21:02:34 +08:00
gazebo
9ce1af079d - 添加正在创建运单中的标志,标识创建运单成功到收到新运单事件这个状态 2019-05-08 11:52:50 +08:00
gazebo
a26c82ef43 - OrderSkuFinancial的index没必要建那么长(而且名字长了也要报错) 2019-05-08 10:00:27 +08:00
gazebo
b21846f0d3 - 去掉order相关的无用的一些字段 2019-05-08 09:48:04 +08:00
gazebo
6a0d9ef7cc - SyncStoresSkus与SyncStoresCategory添加isForce参数 2019-05-07 12:21:56 +08:00
gazebo
a34a812260 - 后台主动取消运单后不会再重新创建 2019-05-07 10:22:39 +08:00
gazebo
66b1f77ad3 - 修改商家分类,SKU,SKUNAME时,将门店分类,商品相应的同步标志位正确设置 2019-05-06 21:11:23 +08:00
gazebo
3928d345b0 - 美团外卖运单压单状态映射 2019-05-05 11:12:52 +08:00
gazebo
fa97e0b038 - 修复饿百调整单消息没有正确更新订单信息的BUG 2019-05-01 10:13:45 +08:00
gazebo
55a9a12727 ! 门店商品同步标志分为price, sale和基础信息modify` 2019-04-30 11:12:45 +08:00
gazebo
6c1e4b99c7 - WaybillStatusName 2019-04-29 12:07:30 +08:00
gazebo
7fa0911495 Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark 2019-04-28 17:28:09 +08:00
gazebo
5ee6bf0b80 - make GoodsOrder.LockStatusTime visible 2019-04-28 17:27:34 +08:00
renyutian
54854f05b5 down_flag 2019-04-28 16:35:14 +08:00
renyutian
9000937294 降级号处理 2019-04-28 16:04:27 +08:00
renyutian
a12d6f04f1 Merge remote-tracking branch 'origin/mark' into lcw 2019-04-28 15:36:24 +08:00
gazebo
1df08e9360 - 平台取消申请审核时限参数
- 一些订单操作标记
- LockStatusTime
2019-04-28 12:14:24 +08:00
gazebo
beb6482a1a - WaybillStatusFailed也会重新创建三方运单
- dadaapi.OrderStatusExpired映射为WaybillStatusCanceled(之前为WaybillStatusFailed)
- 达达重新创建运单时,判断之前的运单状态,如果是WaybillStatusFailed,则为新增订单
- 去掉dao. WrapDB
2019-04-27 10:58:19 +08:00
renyutian
32924c7262 饿百 部分退款订单退款之后由于原正向订单佣金改变而导致扣款金额不准的问题 2019-04-24 15:30:35 +08:00
renyutian
185ebf7d10 饿百 部分退款订单漏单,取错字段 2019-04-24 13:41:27 +08:00
gazebo
ac16fa741b ! 不缓存订单,每次订单或运单事件时都实时加载订单,状态变化立即存储 2019-04-23 11:50:32 +08:00
gazebo
976e1b26e4 - GetStoreOrderAfterTime修改条件为小于OrderStatusEndBegin 2019-04-23 10:12:58 +08:00
gazebo
a29eee3d06 - GetStoreOrderAfterTime ORDER BY t1.order_created_at DESC, t1.id DESC 2019-04-23 09:55:08 +08:00
gazebo
58b299de2c - GetStoreOrderCountInfo2 2019-04-23 09:35:54 +08:00
gazebo
f1e900dbd5 + AcceptOrRefuseFailedGetOrder
+ CallPMCourier
+ ConfirmReceiveGoods
2019-04-22 17:59:55 +08:00
gazebo
892cbd365a - 新增OrderStatusUndoApplyCancel 2019-04-19 17:29:37 +08:00
gazebo
b065c79ec3 - 去掉OrderStatusDelivered状态 2019-04-19 15:26:13 +08:00
gazebo
9f01129374 - 去掉两个没有用的状态OrderStatusFailed,OrderStatusRefund
- 准备将OrderStatusDelivered合并至OrderStatusFinished
2019-04-19 15:02:38 +08:00
gazebo
d93906c5e9 - fk 2019-04-18 19:17:38 +08:00
gazebo
2b4e036619 - 绑定达达时,刷新门店信息 2019-04-18 19:01:12 +08:00
gazebo
77c92c2dbd - tempop.RetrieveEbaiShopLicence 2019-04-17 14:42:40 +08:00
gazebo
65790a6395 - 饿百与美团外卖,全部同步时,删除sku或skuname下架的商品 2019-04-17 14:39:54 +08:00
gazebo
eb174c4d2a - fk 2019-04-16 18:03:31 +08:00
gazebo
be0ab44158 - 美团同步商品时添加sequence 2019-04-16 17:36:07 +08:00
gazebo
0f871847e9 - remove mtwmapi.MsgTypeOrderModified 2019-04-16 17:20:40 +08:00
gazebo
844cc70c1e - 将Dao.DB中db改为Db 2019-04-16 16:14:08 +08:00
gazebo
a6dfc8dbda - 创建与修改SkuName时,防止UPC重复 2019-04-15 15:02:45 +08:00
gazebo
b6468297a1 - ddapi.Sign 2019-04-15 12:42:43 +08:00