liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,259 Commits 4 Branches 0 Tags
3ee2e72a5ed0a16ce3cab50796700bcb72d7baa3
Commit Graph

1005 Commits

Author SHA1 Message Date
gazebo
3ee2e72a5e 美团饿百打包费改为统一系统参数 2019-12-30 18:07:26 +08:00
gazebo
f1d025eb15 +StoreMap.BoxFee 
美团外卖支持打包袋费，美团商品统一添加1角打包费
 2019-12-30 16:50:32 +08:00
gazebo
cee131b197 SetThingMapSyncStatus中的bug修复 2019-12-30 15:32:46 +08:00
gazebo
447e6c2409 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-26 17:29:03 +08:00
gazebo
5361c0cabb Waybill添加TipFee，在订单完成时也会更新，ActualFee肯定会有值，当成总费用 2019-12-26 17:28:28 +08:00
苏尹岚
fad75b7937 Accept Merge Request #118: (yonghui -> mark) 
Merge Request: 投诉骑手
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/118
 2019-12-26 17:10:48 +08:00
苏尹岚
c22581636d 投诉骑手 2019-12-26 17:10:20 +08:00
苏尹岚
edbe3a92f7 Accept Merge Request #116: (yonghui -> mark) 
Merge Request: 根据skuid 批量关注可售
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/116
 2019-12-26 16:24:13 +08:00
苏尹岚
0f4ed3f31e 投诉原因 2019-12-26 16:23:28 +08:00
gazebo
f13a8bbea2 OrderStatusWaybillTipChanged描述 2019-12-26 14:33:58 +08:00
gazebo
deadc8f563 UpdateOrderWaybillTip 2019-12-26 14:18:16 +08:00
苏尹岚
d1a8d45933 部分关注商品修改 2019-12-26 10:37:09 +08:00
苏尹岚
6f84d79901 门店促销 2019-12-26 09:14:26 +08:00
苏尹岚
90cbc5c81f 门店促销 2019-12-26 09:05:19 +08:00
苏尹岚
11310fc16d 投诉骑手 2019-12-26 08:17:14 +08:00
gazebo
6022d24634 GetOrderWaybillInfo可选参数：isGetPos支持获取运单骑手实时信息 2019-12-25 20:14:53 +08:00
苏尹岚
70e2d05549 投诉骑手 2019-12-25 18:39:13 +08:00
苏尹岚
3983e9d5a9 投诉骑手 2019-12-25 18:37:00 +08:00
苏尹岚
6f4cbedada 门店促销指数 2019-12-25 18:14:03 +08:00
苏尹岚
aa3dd73b27 根据skuID关注部分商品 2019-12-25 15:11:49 +08:00
suyl
c124acc53a 商品前缀 2019-12-24 21:00:02 +08:00
苏尹岚
afa708ab99 畅销商品 2019-12-24 18:11:13 +08:00
苏尹岚
e811b3fc75 畅销商品 2019-12-24 17:51:27 +08:00
苏尹岚
afd3bbfea3 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-24 17:27:31 +08:00
苏尹岚
ae043ed566 畅销商品 2019-12-24 17:27:06 +08:00
苏尹岚
73763af5fe Accept Merge Request #102: (yonghui -> mark) 
Merge Request: 畅销商品
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/102
 2019-12-24 16:40:55 +08:00
gazebo
9a76d07868 StoreSkuBind.MtwmID建索引 2019-12-24 15:29:07 +08:00
gazebo
26bfe04b7b up 2019-12-24 14:45:33 +08:00
苏尹岚
ac10d134ea 畅销商品 2019-12-24 14:07:28 +08:00
苏尹岚
471b2c63fc 畅销商品 2019-12-24 13:33:27 +08:00
苏尹岚
eff05244dc 畅销商品 2019-12-24 11:52:23 +08:00
苏尹岚
f98ea4eefa 畅销商品 2019-12-24 11:49:08 +08:00
苏尹岚
322a298223 畅销商品 2019-12-24 11:41:47 +08:00
苏尹岚
5ab567ad77 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-24 11:39:28 +08:00
苏尹岚
70ecbf5114 畅销商品 2019-12-24 11:39:15 +08:00
gazebo
904acbf3de updateStoresSkusWithoutSync中 
关注商品时，如果有删除的相应门店商品，使用恢复删除（而不是新建）
需要处理，在删除某个门店商品，同步失败的情况下，又把商品重新关注。
所以统一处理成恢复删除的记录，这样避免问题
 2019-12-24 11:11:13 +08:00
gazebo
f6e7cb2551 dao.GetOrders中，后台导出订单SKU结算信息时，SKU的earning_price在没有结算信息时，填0。 2019-12-24 10:58:06 +08:00
gazebo
a8dbf89159 fk 2019-12-24 10:44:46 +08:00
gazebo
3d8781ca0f UpdateActPrice4StoreSkuNameNew 2019-12-24 10:41:46 +08:00
gazebo
20aeabd160 去掉SkuName.Name的单独索引 2019-12-23 18:28:21 +08:00
gazebo
ee0b400294 SkuName添加Upc, DeletedAt唯一索引 2019-12-23 18:23:05 +08:00
gazebo
c730a28f19 act.QueryActs 2019-12-23 18:14:57 +08:00
gazebo
01247221c4 SkuName.Upc改为*string（以支持null及添加唯一索引） 2019-12-23 16:15:58 +08:00
苏尹岚
943c4a723d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-23 15:38:01 +08:00
gazebo
c28247e6b7 +GoodsOrder.BaseFreightMoney 2019-12-23 15:35:34 +08:00
苏尹岚
a8439f38e1 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-23 15:29:27 +08:00
苏尹岚
166f5320d3 投诉骑手 2019-12-23 15:27:06 +08:00
gazebo
868cce8445 UpdateActPrice4StoreSkuNameNew中EarningPrice逻辑修改 2019-12-23 10:43:41 +08:00
gazebo
d5e3457173 UpdateSkuSyncStatusForExPrefix改为使用thing_map 2019-12-20 16:21:05 +08:00
苏尹岚
480132cafe 组合名字函数修改 2019-12-20 15:59:42 +08:00