gazebo
|
6066e49014
|
sync2.SyncCategories, SyncReorderCategories
|
2019-12-05 15:30:05 +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 |
|
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 |
|
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 |
|
gazebo
|
ab493a59fb
|
+GetMyOrders
|
2019-11-29 10:35:38 +08:00 |
|
gazebo
|
3756ac67b2
|
调整依赖结构，jxutils不依赖于dao，dao依赖于jxutils
|
2019-11-29 08:43:36 +08:00 |
|
gazebo
|
9c37dd84fc
|
remove SkuCategory.ElmCategoryID and WscCategoryID
|
2019-11-28 15:01:44 +08:00 |
|
gazebo
|
0145442512
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-28 14:29:55 +08:00 |
|
gazebo
|
ae0fb69866
|
订单列表返回城市与区名
|
2019-11-28 14:29:42 +08:00 |
|
苏尹岚
|
e30808a752
|
Accept Merge Request #42: (yonghui -> mark)
Merge Request: 查找京东用户
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/42
|
2019-11-28 14:26:10 +08:00 |
|
gazebo
|
412fe44d32
|
按活动要求强制刷新商品平台价
|
2019-11-28 08:59:56 +08:00 |
|
苏尹岚
|
bbc9be5503
|
查找京东商城用户关联的活跃门店
|
2019-11-28 08:49:53 +08:00 |
|
gazebo
|
1eff6bfd43
|
QueryPageStores添加radius,lng,lat参数
|
2019-11-27 14:34:30 +08:00 |
|
gazebo
|
7410da75fd
|
+GetOrderPay
GetOrders添加参数isPurchase
|
2019-11-27 10:05:26 +08:00 |
|
gazebo
|
6145142f58
|
+model.OrderStatusPayed
|
2019-11-26 17:39:13 +08:00 |
|
苏尹岚
|
20cb7b4414
|
Accept Merge Request #41: (yonghui -> mark)
Merge Request: 根据微盟价更新京西价修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/41
|
2019-11-26 17:12:50 +08:00 |
|
苏尹岚
|
80c5560faf
|
根据微盟更新京西价
|
2019-11-26 17:07:52 +08:00 |
|
gazebo
|
d0f59c3f4b
|
fk
|
2019-11-26 12:00:07 +08:00 |
|
gazebo
|
af7ba61bbc
|
bug fix
|
2019-11-26 11:47:33 +08:00 |
|
gazebo
|
b8a293c296
|
up
|
2019-11-26 11:00:49 +08:00 |
|
苏尹岚
|
3c36f76b58
|
Accept Merge Request #37: (yonghui -> mark)
Merge Request: 统计订单查询bug修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/37
|
2019-11-25 17:40:58 +08:00 |
|
苏尹岚
|
aae1689fc3
|
订单统计查询bug修改
|
2019-11-25 17:40:05 +08:00 |
|
苏尹岚
|
d49446a155
|
Accept Merge Request #36: (yonghui -> mark)
Merge Request: 统计订单查询bug修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/36
|
2019-11-25 17:04:42 +08:00 |
|
苏尹岚
|
0f582721f2
|
统计订单查询bug修改
|
2019-11-25 17:02:35 +08:00 |
|
gazebo
|
3a032c18cd
|
直营店始终按比例结算
|
2019-11-21 18:14:55 +08:00 |
|
gazebo
|
db9e80212f
|
微信支付退款
|
2019-11-21 09:20:56 +08:00 |
|
gazebo
|
358e3eea1e
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-20 16:04:29 +08:00 |
|
gazebo
|
1195e194a1
|
+Pay4Order
|
2019-11-20 15:55:09 +08:00 |
|
苏尹岚
|
ebe4319ab0
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-18 14:42:07 +08:00 |
|