gazebo
|
a0bb7d37f0
|
- 将IsMobileFake用IsStringLikeMobile替换
- 添加HandleOrder4Consignee, GetRealMobile4Order和GetAuthType4Vendor
- 添加GoodsOrder.VendorUserID
|
2019-09-04 18:50:25 +08:00 |
|
gazebo
|
44bc47b05e
|
- 去掉对于ede_skus与jde_sku_infos的依赖
|
2019-09-03 16:01:48 +08:00 |
|
gazebo
|
4e617f4ef5
|
- 京西自营商城可以存订单了
|
2019-09-02 18:33:43 +08:00 |
|
gazebo
|
16e9e02e94
|
- getOrders的keyword搜索vendor_order_id2
|
2019-09-01 17:29:30 +08:00 |
|
gazebo
|
21b66cc482
|
- updateOrderSkuOtherInfo中固化订单商品的EarningPrice
|
2019-08-29 17:31:21 +08:00 |
|
gazebo
|
d0fd45e751
|
- 优化AmendMissingOrders
|
2019-08-28 18:08:41 +08:00 |
|
gazebo
|
ec612b807b
|
- fk
|
2019-08-26 17:31:56 +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
|
68d7b107f7
|
- 限制ConsigneeName长度
|
2019-08-17 16:23:51 +08:00 |
|
gazebo
|
8ea31c1967
|
- 修复计算GoodsOrder.EarningPrice的bug.
|
2019-08-16 17:41:15 +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
|
37b931abe5
|
+ OrderSkuFinancial.StoreSubID, StoreSubName
|
2019-08-13 10:27:29 +08:00 |
|
gazebo
|
55ab58df0f
|
- 修复SaveOrderFinancialInfo中误删售后单的BUG
|
2019-08-13 09:34:51 +08:00 |
|
gazebo
|
c5a5f4777b
|
- AdjustOrder与PartRefundOrder中，为了区别活动与非活动SKU，需转入SubStoreID（即单品的活动ID）区分
|
2019-08-12 17:17:12 +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
|
991128242a
|
- OrderSku.StoreSubID当成活动ID来使用
|
2019-07-27 16:24:00 +08:00 |
|
gazebo
|
f21666e6bd
|
- 去掉对于GetPromotionSkuPriceMap的使用
|
2019-07-25 17:21:59 +08:00 |
|
gazebo
|
f265e13c2c
|
- 修复GetEffectiveActStoreSkuInfo不返回平台信息的bug
|
2019-07-25 16:53:49 +08:00 |
|
gazebo
|
db45cf2051
|
- 禁止在老版活动上创建补贴表，迁移至新版，暂时保持活动表的兼容
|
2019-07-25 08:35:30 +08:00 |
|
gazebo
|
743c3446e3
|
- 在updateOrderSkuOtherInfo中获取商品活动价时，以订单创建时间（而不是当前时间）为准
|
2019-07-24 16:56:43 +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
|
652948966b
|
- 修复OrderManager.OnWaybillStatusChanged中在收到接单消息时缺失运单处理的BUG
|
2019-07-09 18:21:42 +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
|
c11a0af51a
|
+ RefreshOrderFinancial
- 京东订单在收到订单应结消息时再次刷新应结信息（有时在订单生成时不能正常得到应结消息）
|
2019-06-21 15:38:21 +08:00 |
|
gazebo
|
9d01bddc65
|
- GetPromotionSkuPriceMap不与EarningPrice相关
|
2019-06-21 10:33:49 +08:00 |
|
gazebo
|
16cf42718a
|
- GetStoresSkus返回商品活动价格信息
|
2019-06-21 09:55:44 +08:00 |
|
gazebo
|
df7d58c50d
|
- updateOrderOtherInfo中忽略找不到门店映射的错误
|
2019-06-20 17:04:47 +08:00 |
|
gazebo
|
5adafac669
|
- up
|
2019-06-20 13:39:44 +08:00 |
|
gazebo
|
ae9833361a
|
- dao.GetPromotionSkuPriceMap
- 京西活动要求不能冲突
|
2019-06-20 11:23:04 +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 |
|