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 |
|
gazebo
|
16725bf8f8
|
- 修改Rollback调用时机
- 创建三方运单判断EnableStoreWrite
|
2019-04-13 11:30:24 +08:00 |
|
XJH-Rosy
|
d9785939cd
|
Accept Merge Request #12: (lcw -> mark)
Merge Request: 修复一些报警
Created By: @XJH-Rosy
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/12
|
2019-04-12 17:55:47 +08:00 |
|
gazebo
|
cc627da2a4
|
- 修复FormalizeStoreStatus中的死锁问题
|
2019-04-12 17:26:28 +08:00 |
|
gazebo
|
47ec846c36
|
- dao.FormalizeStoreStatus
|
2019-04-12 17:10:35 +08:00 |
|
renyutian
|
b342af3e7e
|
美团正向账单bug优化 skuid-->vendorskuid
|
2019-04-12 13:48:22 +08:00 |
|
gazebo
|
ca8d0b362b
|
- 单门店同步商品时，只同步SKUNAME和SKU可售的
|
2019-04-12 11:16:39 +08:00 |
|
gazebo
|
e2f728889b
|
- dao.GetStoreSkus 与 dao.GetFullStoreSkus 智能取sku name的img
|
2019-04-11 17:06:46 +08:00 |
|
gazebo
|
53fa68d3ba
|
- 饿百图片库管理
|
2019-04-11 14:39:45 +08:00 |
|
gazebo
|
6e3b9a8215
|
- 将微信的备注改为店名相关的信息
|
2019-04-11 11:59:04 +08:00 |
|
gazebo
|
83e0b698a8
|
- 中午云打印
|
2019-04-10 18:27:16 +08:00 |
|
gazebo
|
aeca8901d8
|
- 同步门店商品时，以门店价格排序
|
2019-04-10 13:56:54 +08:00 |
|
gazebo
|
927c6db248
|
Merge remote-tracking branch 'origin/lcw' into mark
|
2019-04-10 09:28:14 +08:00 |
|
gazebo
|
a8c4b6e675
|
- fix printer_vendor_i_d to printer_vendor_id
|
2019-04-10 09:06:37 +08:00 |
|
gazebo
|
54a0cc216d
|
- yilianyun printer added
|
2019-04-09 20:56:53 +08:00 |
|
renyutian
|
4a1b80261c
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-09 12:03:43 +08:00 |
|
gazebo
|
8c6b1bc067
|
- 重构打印机流程，添加“外卖管家”打印
|
2019-04-09 11:35:27 +08:00 |
|
renyutian
|
7d820a6131
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-04 18:08:47 +08:00 |
|
gazebo
|
014ee01dd6
|
- message.content to text
|
2019-04-04 17:09:04 +08:00 |
|
renyutian
|
632aa6aa3d
|
结账第二期
|
2019-04-03 17:49:30 +08:00 |
|
gazebo
|
d1d056077d
|
- 飞鹅打印机支持
|
2019-04-01 21:00:15 +08:00 |
|
gazebo
|
12781c14be
|
+ 添加canOrderCreateWaybillNormally
|
2019-03-30 18:32:13 +08:00 |
|
gazebo
|
715b44e592
|
- OrderStatusMsg: "通知消息"
|
2019-03-30 17:19:37 +08:00 |
|
gazebo
|
96fb2d9535
|
- 重构createWaybillOn3rdProviders
|
2019-03-30 17:11:23 +08:00 |
|