gazebo
|
0d7d3161b9
|
- 拉取平台门店数据，缺省8KM半径
|
2019-06-25 16:07:36 +08:00 |
|
gazebo
|
73e9355903
|
- 重构GetCityCoordinateList
|
2019-06-25 15:47:50 +08:00 |
|
gazebo
|
8f7c6f13ea
|
- QueryPageStores添加orgCode参数
|
2019-06-25 14:45:15 +08:00 |
|
gazebo
|
113f376ee3
|
- maxDiffFee2Mtps改为2元
|
2019-06-25 14:14:00 +08:00 |
|
gazebo
|
a1aa4de06c
|
- 不获取门店坐标信息（节约高德API配额）
|
2019-06-25 14:10:35 +08:00 |
|
gazebo
|
64e45962bf
|
- 手工创建三方运单记录消息
|
2019-06-25 13:26:41 +08:00 |
|
gazebo
|
6559fb212e
|
+ QueryPageStores
|
2019-06-25 11:53:20 +08:00 |
|
gazebo
|
6cfc7091d1
|
- GetAndStoreCitiesShops
|
2019-06-25 09:26:12 +08:00 |
|
gazebo
|
fc5c7ae609
|
Merge branch 'mark' into get-store
|
2019-06-24 21:43:41 +08:00 |
|
gazebo
|
dd92bb99f5
|
- 饿百与京东拉门店数据基本OK
|
2019-06-24 21:43:20 +08:00 |
|
gazebo
|
3fed4d3af9
|
Merge branch 'master' into get-store
|
2019-06-24 10:17:56 +08:00 |
|
gazebo
|
594aa3e6b7
|
- 重构新京西活动，平台接口定为笼统的SyncAct，京平台支持添加，删除商品，暂不支持修改
|
2019-06-23 21:06:41 +08:00 |
|
gazebo
|
ec891581ce
|
+ tSkuInfo
|
2019-06-23 10:03:35 +08:00 |
|
gazebo
|
c3119f4932
|
- 重构GetStoresSkus
|
2019-06-22 20:44:35 +08:00 |
|
gazebo
|
c3feea5ff4
|
- GetStoresSkus中返回realEarningPrice
|
2019-06-22 18:18:25 +08:00 |
|
gazebo
|
b536d7a01a
|
- service服务启动文件加大打开文件数配置
|
2019-06-22 17:25:08 +08:00 |
|
gazebo
|
1c9e3acd0f
|
- 修复updateStoreSkusSaleWithoutSync中更新StoreSkuBind的错误（应该先读再存）
|
2019-06-22 01:16:59 +08:00 |
|
gazebo
|
bbf381834f
|
- 禁用京东门店修改消息
|
2019-06-21 21:15:54 +08:00 |
|
gazebo
|
945c5285dd
|
- SyncStoresSkus强制更新标志从SyncFlagModifiedMask改为SyncFlagStoreSkuModifiedMask
|
2019-06-21 16:26:13 +08:00 |
|
gazebo
|
a482cd6b12
|
- ebai商品完全使用私自编码的UPC，即使填了真实的也不用
|
2019-06-21 16:16:48 +08:00 |
|
gazebo
|
c11a0af51a
|
+ RefreshOrderFinancial
- 京东订单在收到订单应结消息时再次刷新应结信息（有时在订单生成时不能正常得到应结消息）
|
2019-06-21 15:38:21 +08:00 |
|
gazebo
|
46a7d291a2
|
- GetStoresSkus恢复误删的name_id
|
2019-06-21 11:09:25 +08:00 |
|
gazebo
|
7f44446390
|
- up
|
2019-06-21 11:02:16 +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
|
717b15cf90
|
- jd.onAfsOrderMsg避免消息重复
|
2019-06-20 18:13:59 +08:00 |
|
gazebo
|
18073dc157
|
- refactor
|
2019-06-20 18:01:54 +08:00 |
|
gazebo
|
df7d58c50d
|
- updateOrderOtherInfo中忽略找不到门店映射的错误
|
2019-06-20 17:04:47 +08:00 |
|
gazebo
|
62f497fcaa
|
- up
|
2019-06-20 16:08:26 +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
|
faca22c993
|
- 取消活动时逻辑调整
|
2019-06-20 09:41:00 +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
|
8f382e4dec
|
- GoodsOrder.TotalShopMoney的json修正为totalShopMoney
|
2019-06-19 18:07:06 +08:00 |
|
gazebo
|
ab7b33c8ec
|
- 禁止“创建运单失败N次”报警
|
2019-06-19 17:15:05 +08:00 |
|
gazebo
|
64a101c513
|
- 京西活动不对参数进行检查
|
2019-06-19 16:03:50 +08:00 |
|
gazebo
|
d8c73c6710
|
- 查询活动时，返回earngPrice
|
2019-06-19 14:28:10 +08:00 |
|
gazebo
|
fe405d95ba
|
- 三个平台同步时限制商品名长度
|
2019-06-19 14:18:54 +08:00 |
|
gazebo
|
840406aad4
|
- promotion/CreatePromotion支持创建京西与京东活动
|
2019-06-19 13:52:13 +08:00 |
|
gazebo
|
90b29132c0
|
- 调整门店调价比例后要设置的标志应该是SyncFlagPriceMask
|
2019-06-19 10:40:12 +08:00 |
|
gazebo
|
b6303b7013
|
- 添加京西活动，用于记录活动商品结算价格
|
2019-06-18 17:44:09 +08:00 |
|
gazebo
|
bbc6dcd84a
|
- 修正美团订单的PmSubsidyMoney计算错误
|
2019-06-18 16:30:04 +08:00 |
|
gazebo
|
45c14d27f2
|
- GoodsOrder添加PmSubsidyMoney
|
2019-06-18 15:02:26 +08:00 |
|
gazebo
|
41a6e71708
|
- GetMissingStoreSkuFromOrder的fromTime是强制参数
|
2019-06-18 10:52:44 +08:00 |
|
gazebo
|
a9052f4bbc
|
- 对于单门店平台，同步商品时，多个门店同时并发同步
|
2019-06-18 10:41:48 +08:00 |
|
gazebo
|
c64140fdcf
|
+ 添加GoodsOrder.TotalShopMoney表示应结金额-第三方平台结算给京西的金额（包括了所有的补贴，扣除）
|
2019-06-18 10:17:24 +08:00 |
|
gazebo
|
0f4f6b937f
|
- GetStoreMessageStatuses也返回title
|
2019-06-18 09:00:32 +08:00 |
|