Commit Graph

846 Commits

Author SHA1 Message Date
苏尹岚
0a6f7d6777 查询门店价格评分 2019-12-06 17:21:42 +08:00
苏尹岚
5d556203fe 推荐商品 2019-12-06 15:49:48 +08:00
苏尹岚
f1b01506d3 推荐商品 2019-12-06 15:44:08 +08:00
苏尹岚
0046255791 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-06 15:26:18 +08:00
苏尹岚
d4d20f4ddf 推荐分类 2019-12-06 15:26:03 +08:00
gazebo
7fb09f99d1 整理DataResource相关的内容 2019-12-06 15:20:22 +08:00
gazebo
b9421e7979 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-06 14:55:34 +08:00
gazebo
92ecba727d 新SyncSkus基本能工作 2019-12-06 14:55:16 +08:00
苏尹岚
d35fe2c40d 推荐商品,分类 2019-12-06 13:50:27 +08:00
gazebo
6806ab202d Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-06 09:45:22 +08:00
gazebo
9c2c65d266 去掉SkuCategoryWithVendor 2019-12-06 09:41:11 +08:00
苏尹岚
ab7201e973 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-06 09:05:16 +08:00
苏尹岚
c6abdbbd3e 价格参考 2019-12-06 09:04:55 +08:00
gazebo
d6d59e4ef5 !!!调整SkuStoreCatInfo与StoreSkuSyncInfo中SyncStatus的字段名 2019-12-05 18:22:12 +08:00
苏尹岚
496ff86ff4 Accept Merge Request #52: (yonghui -> mark)
Merge Request: 获取各平台未营业门店
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/52
2019-12-05 17:22:37 +08:00
gazebo
6066e49014 sync2.SyncCategories, SyncReorderCategories 2019-12-05 15:30:05 +08:00
苏尹岚
ab08935d4d 获取未营业门店 2019-12-05 15:06:45 +08:00
苏尹岚
8b29246088 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-05 14:47:08 +08:00
苏尹岚
9dd4c76074 获取各平台未营业门店 2019-12-05 14:46:52 +08:00
gazebo
1c05e4c1da dao.GetUsers keyword支持id查找 2019-12-05 14:00:15 +08:00
gazebo
efd358b0d4 up 2019-12-05 13:32:49 +08:00
gazebo
e742d88efd 加入ThingMap表示商品库的同步信息 2019-12-05 09:04:23 +08:00
gazebo
527659bf55 dao.GetOrders的排序调整 2019-12-05 08:35:31 +08:00
苏尹岚
621ae66f6e Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-04 17:56:08 +08:00
gazebo
e6004bea32 重构sku,skuname,category的CUD 2019-12-04 12:11:57 +08:00
gazebo
2635fb035a +ThingMap
+OnxxThing
2019-12-04 10:57:31 +08:00
gazebo
f69173bd2e 去掉注释"!!! 此函数不要将store_sku_bind中的vendor_price取出来放到StoreSkuSyncInfo.VendorPrice中,因为之后会依赖这个VendorPrice进行重算" 2019-12-04 10:01:05 +08:00
gazebo
457bd4b0a2 GetStoreOrderAfterTime排除内部单 2019-12-03 17:52:51 +08:00
gazebo
902c770515 调整GetOrders中的排序逻辑 2019-12-03 15:34:14 +08:00
苏尹岚
ab9bdbbff9 推荐分类 2019-12-03 11:09:06 +08:00
苏尹岚
d570664efa 推荐分类 2019-12-03 11:03:52 +08:00
苏尹岚
dc58180729 推荐商品 2019-12-03 10:45:42 +08:00
苏尹岚
6dbb783aec 推荐商品 2019-12-03 10:42:50 +08:00
苏尹岚
d81ff0241b Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-03 10:26:52 +08:00
苏尹岚
f4c400d69e 推荐商品 2019-12-03 10:25:12 +08:00
gazebo
0a6136731e Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-03 10:17:29 +08:00
gazebo
30b5ff0c70 尽量去掉对于UpdateEntityLogicallyAndUpdateSyncStatus的使用 2019-12-03 10:17:12 +08:00
苏尹岚
8c196ab87f 推荐商品 2019-12-03 10:09:55 +08:00
gazebo
a03aa52be2 GoodsOrder.UserID as index 2019-12-02 21:59:50 +08:00
徐建华
34a1f1d954 Accept Merge Request #48: (yonghui -> mark)
Merge Request: 门店订单归属补漏
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/48
2019-12-02 14:37:09 +08:00
gazebo
351551bfe1 up 2019-12-02 14:24:23 +08:00
苏尹岚
d4edd5d06d 订单门钉归属修改 2019-12-02 11:30:36 +08:00
苏尹岚
410f671a36 冲突修改 2019-12-02 11:14:20 +08:00
苏尹岚
3c5afc31b6 接口位置移动,门店归属补漏修改,获取京东用户修改 2019-12-02 11:12:09 +08:00
gazebo
0a42beac8a +GetMyOrderCountInfo 2019-12-02 11:00:57 +08:00
苏尹岚
6c0c837fae 门店归属订单不漏 2019-11-29 17:48:29 +08:00
gazebo
2d653c2e19 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-11-29 11:13:56 +08:00
gazebo
4c948798f1 up 2019-11-29 11:13:46 +08:00
苏尹岚
519c4eadec Merge remote-tracking branch 'origin/mark' into yonghui 2019-11-29 11:09:48 +08:00
苏尹岚
34ee046ce2 获取京东用户修改,刷新订单结算价修改 2019-11-29 11:09:07 +08:00