gazebo
|
e2453e6832
|
+ RefundOrder, PartRefundOrder
|
2019-07-22 11:08:02 +08:00 |
|
gazebo
|
f65e06168e
|
- 重构了一下misc中定时器相关的函数
|
2019-07-19 15:10:56 +08:00 |
|
gazebo
|
d5752381c7
|
+ partner.ListOrders
+ AmendMissingOrders
|
2019-07-18 18:46:14 +08:00 |
|
gazebo
|
da882a7cf5
|
- 导出订单时（ExportOrders），将售后单的商品去除
|
2019-07-03 17:29:16 +08:00 |
|
gazebo
|
37ba00c47e
|
- GetAfsOrderSkuInfo中判断t1.is_afs_order = 1
|
2019-07-03 16:16:23 +08:00 |
|
gazebo
|
e4dd934974
|
- ExportOrders导出VendorOrderID2
|
2019-07-03 10:57:50 +08:00 |
|
gazebo
|
9db43e273a
|
- GetStores添加订单相关的查询条件
|
2019-06-28 11:25:26 +08:00 |
|
gazebo
|
bb7834c268
|
- 订单导出sku的earningPrice
|
2019-06-20 10:32:17 +08:00 |
|
gazebo
|
8a707df773
|
- GetOrderSkuInfo返回RealEarningPrice代表单品实际结给商家的钱
|
2019-06-20 10:05:35 +08:00 |
|
gazebo
|
7a4eb0cce3
|
+ GoodsOrder添加EarningPrice表示结算给门店的金额
|
2019-06-19 22:46:53 +08:00 |
|
gazebo
|
9360f11da9
|
- 修改订单中实时计算的earningPrice算法
|
2019-06-19 22:11:54 +08:00 |
|
gazebo
|
b6303b7013
|
- 添加京西活动，用于记录活动商品结算价格
|
2019-06-18 17:44:09 +08:00 |
|
gazebo
|
2c7adce96e
|
- 临时将返回的订单SKU中为0的shop_price设置为sale_price
|
2019-06-15 11:36:40 +08:00 |
|
gazebo
|
cf8fa813f8
|
- EarningPrice通过Store.PayPercentage来算，缺省是70%
|
2019-06-14 11:03:16 +08:00 |
|
gazebo
|
52ae2696ab
|
- 订单导出添加courierVendorName
|
2019-06-14 10:25:07 +08:00 |
|
gazebo
|
2739dfc963
|
- 添加earningPrice在GetStoresOrderSaleInfo中
|
2019-06-14 09:57:11 +08:00 |
|
gazebo
|
f4691530c5
|
- add VendorPrice and PayMoney in StoresOrderSaleInfo
|
2019-06-13 21:46:50 +08:00 |
|
gazebo
|
d0df80ac1e
|
- ExportShopsHealthInfo
|
2019-06-11 16:42:23 +08:00 |
|
gazebo
|
c8fed4543f
|
- 去除OrderManager.getOrders中不必要的事务
|
2019-05-29 17:12:30 +08:00 |
|
gazebo
|
e94361295f
|
- 七牛云资源添加前缀区分
|
2019-05-24 17:38:16 +08:00 |
|
gazebo
|
551aa74d5c
|
- 售后单查询错误信息修改
|
2019-05-24 16:43:48 +08:00 |
|
gazebo
|
0b3018e47f
|
- OrderSkuFinancial中的Count正确更新（三平台）
- 售后单审核后，确认收到退货后设置标志
- GetAfsOrderSkuInfo返回图片image
|
2019-05-24 10:14:55 +08:00 |
|
gazebo
|
284e92381c
|
- 重构GetOrders与ExportOrders
|
2019-05-23 18:30:33 +08:00 |
|
gazebo
|
c8d57d0808
|
- 修改订单导出文件格式，去掉冒号
|
2019-05-23 10:16:11 +08:00 |
|
gazebo
|
e024203e2f
|
- ExportOrders
|
2019-05-23 09:55:11 +08:00 |
|
gazebo
|
0a5f9c3060
|
- 将GetStoreOrderCountInfo的实现换成GetStoreOrderCountInfo2一致的（准备之后去掉GetStoreOrderCountInfo2）
- 添加GetStoreAfsOrderCountInfo
|
2019-05-22 09:46:23 +08:00 |
|
gazebo
|
5c436326bf
|
+ GetAfsOrders
+ GetAfsOrderSkuInfo
|
2019-05-15 14:55:02 +08:00 |
|
gazebo
|
ec6ee2620c
|
- 将美团外卖售中，商户同意取消订单消息当成订单取消消息
|
2019-05-15 12:14:20 +08:00 |
|
gazebo
|
9ef595bee6
|
- GetOrders中waybillVendorIDs条件应该使用goods_order中的字段
|
2019-05-14 11:28:04 +08:00 |
|
gazebo
|
37da5be607
|
- 实现GetStoresOrderSaleInfo
|
2019-05-13 16:07:42 +08:00 |
|
gazebo
|
9114700688
|
- tmp GetStoresOrderSaleInfo
|
2019-05-13 11:42:58 +08:00 |
|
gazebo
|
6aeb907f37
|
- modify GetOrderStatusList
|
2019-05-09 20:51:10 +08:00 |
|
gazebo
|
ea75a0ad7b
|
- 调整QueryOrderWaybillFeeInfo
|
2019-05-07 12:01:07 +08:00 |
|
gazebo
|
244baf165c
|
- debug msg
|
2019-05-06 09:41:25 +08:00 |
|
gazebo
|
58b299de2c
|
- GetStoreOrderCountInfo2
|
2019-04-23 09:35:54 +08:00 |
|
gazebo
|
7ee5f2fdd8
|
- GetOrders中指定了vendorOrderID参数后，不忽略vendorIDs参数
|
2019-04-19 10:24:31 +08:00 |
|
gazebo
|
976d02727b
|
- 去掉重复函数GetGetStoreOrderInfo
- GetOrders中将orderID改为vendorOrderID
|
2019-04-19 10:06:47 +08:00 |
|
gazebo
|
2cde3ba1b5
|
- GetStoreOrderCountInfo排除掉LOCK了的订单
|
2019-04-17 15:19:57 +08:00 |
|
renyutian
|
657374d8ba
|
t2.delivery_confirm_time 不存在
|
2019-04-08 15:14:54 +08:00 |
|
renyutian
|
1094c325fa
|
美团公益捐款优化
|
2019-04-08 15:07:10 +08:00 |
|
renyutian
|
632aa6aa3d
|
结账第二期
|
2019-04-03 17:49:30 +08:00 |
|
gazebo
|
03e4f9e979
|
- 查询订单SKU相关的信息时，忽略已经删除的判断
|
2019-04-03 09:12:38 +08:00 |
|
gazebo
|
d602fe2fa1
|
- search vendor_order_id2 when orderID is specified in GetOrders
|
2019-03-14 16:54:13 +08:00 |
|
gazebo
|
796567c364
|
- in GetOrders, if keyword looks like a orderID, then ignore other conditions.
|
2019-02-27 10:31:04 +08:00 |
|
gazebo
|
0f9949d73d
|
- fix bug when get OrderManager.GetOrders when orderID given
|
2019-02-16 18:19:58 +08:00 |
|
gazebo
|
65000be3d0
|
- remove enableStore and orderUseNewTable related stuff
|
2019-02-12 15:11:30 +08:00 |
|
gazebo
|
a7167de7bf
|
- order/GetOrders new param:orderID
|
2019-01-28 15:05:48 +08:00 |
|
gazebo
|
547447caad
|
- handle weimob order correctly in orderman_ext
|
2019-01-25 12:28:46 +08:00 |
|
gazebo
|
670283a152
|
- comment
|
2019-01-21 17:08:53 +08:00 |
|
gazebo
|
a64c024dd8
|
- GetOrderSkuInfo don't append sku spec if already existed
|
2019-01-11 22:17:11 +08:00 |
|