gazebo
|
8b0503c954
|
去掉微盟微商城相关的代码
|
2019-09-25 13:41:54 +08:00 |
|
gazebo
|
d25b096353
|
- GetAfsOrders添加参数skuIDs
|
2019-09-25 11:16:51 +08:00 |
|
gazebo
|
72c9889d10
|
- GetOrders添加GetOrders参数
|
2019-09-24 14:51:15 +08:00 |
|
gazebo
|
569abe56b5
|
- 添加自提假订单处理
|
2019-09-11 17:31:07 +08:00 |
|
gazebo
|
eab614a734
|
+ RegisterPurchaseOrderHandler（为了适应加入的京西自营商城）
|
2019-09-11 15:10:32 +08:00 |
|
gazebo
|
6efdcdf692
|
- GetOrderStatusList中的排序规则
|
2019-09-05 09:34:48 +08:00 |
|
gazebo
|
44bc47b05e
|
- 去掉对于ede_skus与jde_sku_infos的依赖
|
2019-09-03 16:01:48 +08:00 |
|
gazebo
|
16e9e02e94
|
- getOrders的keyword搜索vendor_order_id2
|
2019-09-01 17:29:30 +08:00 |
|
gazebo
|
d0fd45e751
|
- 优化AmendMissingOrders
|
2019-08-28 18:08:41 +08:00 |
|
gazebo
|
73a26e0d36
|
- GetStoresOrderSaleInfoNew
|
2019-08-20 15:00:29 +08:00 |
|
gazebo
|
71dec1ed4c
|
- up
|
2019-08-20 14:53:52 +08:00 |
|
gazebo
|
927a5059ed
|
- fk
|
2019-08-20 14:42:24 +08:00 |
|
gazebo
|
1a54bdd91d
|
- up
|
2019-08-20 14:28:00 +08:00 |
|
gazebo
|
6bd473839c
|
- 修复GetStoresOrderSaleInfoNew中的bug
|
2019-08-20 14:07:31 +08:00 |
|
gazebo
|
bcd8eba95e
|
- fix bug in GetStoresOrderSaleInfoNew
|
2019-08-20 12:09:02 +08:00 |
|
gazebo
|
fa3d022750
|
Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark
|
2019-08-20 11:06:09 +08:00 |
|
gazebo
|
7a91faec5b
|
+ GetStoresOrderSaleInfoNew
|
2019-08-20 10:59:47 +08:00 |
|
gazebo
|
9a5bde9d09
|
- 修复getOrders按城市查询的BUG
|
2019-08-16 11:26:58 +08:00 |
|
gazebo
|
14e3594455
|
- GetStoresOrderSaleInfo添加售后单信息
|
2019-08-16 11:08:09 +08:00 |
|
gazebo
|
37ade34458
|
- getOrders中优化对时间字符的解析处理
|
2019-08-14 10:15:28 +08:00 |
|
gazebo
|
c48ebb4bd7
|
- GetOrders容错
|
2019-08-14 10:04:54 +08:00 |
|
gazebo
|
1d0aa132f9
|
- GoodsOrder.WaybillTipMoney的含义改为京西主动加的小费
- partner.IUpdateWaybillTip改为IAddWaybillTip
|
2019-08-01 18:09:23 +08:00 |
|
gazebo
|
5628f86a10
|
- GetOrders添加可选参数：isDateFinish
- ExportOrders以完成时间来导出
|
2019-07-30 11:56:45 +08:00 |
|
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 |
|