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
|
33a628106b
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-23 18:23:34 +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 |
|
苏尹岚
|
d86a0e1b26
|
Accept Merge Request #101: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/101
|
2019-12-23 18:12:48 +08:00 |
|
苏尹岚
|
a1bdf6cde3
|
订单预警
|
2019-12-23 18:12:03 +08:00 |
|
苏尹岚
|
758e0f23f2
|
订单预警
|
2019-12-23 17:50:11 +08:00 |
|
gazebo
|
65c09d395b
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-23 17:27:38 +08:00 |
|
gazebo
|
54aeef6b4a
|
fk
|
2019-12-23 17:27:30 +08:00 |
|
苏尹岚
|
7800543f22
|
Accept Merge Request #100: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/100
|
2019-12-23 17:02:56 +08:00 |
|
苏尹岚
|
1e640ad6f4
|
订单预警
|
2019-12-23 17:01:58 +08:00 |
|
gazebo
|
01247221c4
|
SkuName.Upc改为*string（以支持null及添加唯一索引）
|
2019-12-23 16:15:58 +08:00 |
|
gazebo
|
23136cc467
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-23 15:44:42 +08:00 |
|
gazebo
|
fb599e610c
|
fix ebai BaseFreightMoney
|
2019-12-23 15:44:25 +08:00 |
|
苏尹岚
|
2ee7c74e2a
|
投诉骑手
|
2019-12-23 15:41:43 +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
|
0b35c7a932
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-23 14:46:18 +08:00 |
|
gazebo
|
c6a99d73f8
|
up
|
2019-12-23 14:46:07 +08:00 |
|
苏尹岚
|
63e3ed0b4a
|
Accept Merge Request #98: (yonghui -> mark)
Merge Request: 订单利润预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/98
|
2019-12-23 10:57:50 +08:00 |
|
苏尹岚
|
3f98af6a11
|
订单利润预警
|
2019-12-23 10:45:12 +08:00 |
|
gazebo
|
868cce8445
|
UpdateActPrice4StoreSkuNameNew中EarningPrice逻辑修改
|
2019-12-23 10:43:41 +08:00 |
|
苏尹岚
|
ddb129dbc0
|
订单预警
|
2019-12-23 10:32:40 +08:00 |
|
苏尹岚
|
cb94b34a88
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-23 10:30:05 +08:00 |
|
苏尹岚
|
846442f478
|
订单利润报警
|
2019-12-23 10:29:35 +08:00 |
|
gazebo
|
3040e0baf7
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-21 13:06:46 +08:00 |
|
gazebo
|
9e92f40a47
|
amendAndPruneStoreStuff中删除平台商品单个操作
|
2019-12-21 13:06:04 +08:00 |
|
苏尹岚
|
693be23ca0
|
获取各平台门店商品价格
|
2019-12-20 17:59:27 +08:00 |
|
苏尹岚
|
5e93227546
|
获取平台门店商品价格
|
2019-12-20 17:24:36 +08:00 |
|
苏尹岚
|
ce4703b720
|
获取各平台商品门店价格
|
2019-12-20 16:58:19 +08:00 |
|
gazebo
|
d5e3457173
|
UpdateSkuSyncStatusForExPrefix改为使用thing_map
|
2019-12-20 16:21:05 +08:00 |
|
苏尹岚
|
480132cafe
|
组合名字函数修改
|
2019-12-20 15:59:42 +08:00 |
|
苏尹岚
|
7766c9428d
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-20 14:41:53 +08:00 |
|
苏尹岚
|
da2440e971
|
获取平台门店商品价格
|
2019-12-20 14:41:21 +08:00 |
|
苏尹岚
|
b2e9f91373
|
商品前缀
|
2019-12-20 14:40:22 +08:00 |
|
苏尹岚
|
0a8a0faec4
|
exprefix索引，order修改
|
2019-12-20 14:32:14 +08:00 |
|
苏尹岚
|
fc588aec60
|
获取平台门店商品价格
|
2019-12-20 11:56:53 +08:00 |
|
gazebo
|
41f0d1fa3d
|
up
|
2019-12-20 11:44:09 +08:00 |
|
苏尹岚
|
b8f7ffea18
|
获取门店商品价格
|
2019-12-20 11:40:04 +08:00 |
|
gazebo
|
53bd1ecb43
|
fk
|
2019-12-20 11:33:17 +08:00 |
|
gazebo
|
015e098a6c
|
订单打印去掉ActualPayPrice
|
2019-12-20 11:28:35 +08:00 |
|
gazebo
|
db37338060
|
up
|
2019-12-20 11:23:40 +08:00 |
|
苏尹岚
|
d6d4ab23bb
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-20 11:23:16 +08:00 |
|
苏尹岚
|
f72257d07c
|
获取平台门店商品价格
|
2019-12-20 11:22:41 +08:00 |
|