gazebo
|
c2787d64b7
|
fk
|
2019-12-04 18:36:56 +08:00 |
|
gazebo
|
5cecffc501
|
+ConstrainPayPercentage
|
2019-12-04 18:17:44 +08:00 |
|
苏尹岚
|
621ae66f6e
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-04 17:56:08 +08:00 |
|
gazebo
|
4d3eb5d94c
|
添加改价时的isScale
|
2019-12-04 17:49:45 +08:00 |
|
苏尹岚
|
7e21f6edd1
|
合并mark
|
2019-12-04 17:37:06 +08:00 |
|
苏尹岚
|
6d677bab43
|
同步错误返回
|
2019-12-04 17:34:45 +08:00 |
|
gazebo
|
e6004bea32
|
重构sku,skuname,category的CUD
|
2019-12-04 12:11:57 +08:00 |
|
苏尹岚
|
16a14e8b4d
|
同步错误返回
|
2019-12-04 11:56:02 +08:00 |
|
gazebo
|
a255acb4f1
|
修复ReorderCategories中的bug
|
2019-12-04 11:05:33 +08:00 |
|
gazebo
|
2635fb035a
|
+ThingMap
+OnxxThing
|
2019-12-04 10:57:31 +08:00 |
|
苏尹岚
|
9447c6b591
|
同步错误返回
|
2019-12-04 10:37:40 +08:00 |
|
苏尹岚
|
72c60532e8
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-12-04 10:33:09 +08:00 |
|
苏尹岚
|
4c4ed40c24
|
同步错误返回
|
2019-12-04 10:32:43 +08:00 |
|
gazebo
|
3fe9fd5483
|
修复cms.DeleteStoreSku中漏设置美团外卖删除标志
|
2019-12-04 09:24:10 +08:00 |
|
苏尹岚
|
aade004105
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-12-04 09:17:27 +08:00 |
|
苏尹岚
|
7f8615abfb
|
同步错误返回
|
2019-12-04 09:17:06 +08:00 |
|
gazebo
|
55fdde9be2
|
LoopMultiStoresVendors引入OrgCode
|
2019-12-03 18:27:53 +08:00 |
|
苏尹岚
|
2b979a4f68
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-12-03 11:30:40 +08:00 |
|
苏尹岚
|
d570664efa
|
推荐分类
|
2019-12-03 11:03:52 +08:00 |
|
苏尹岚
|
dc58180729
|
推荐商品
|
2019-12-03 10:45:42 +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 |
|
苏尹岚
|
9b382088c4
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-03 09:18:48 +08:00 |
|
苏尹岚
|
0c55b76bf1
|
推荐商品
|
2019-12-03 09:18:31 +08:00 |
|
gazebo
|
30e918c5e2
|
删除历史无用的代码
|
2019-12-03 09:15:58 +08:00 |
|
苏尹岚
|
33fbbf7192
|
禁用京东用户
|
2019-12-02 19:02:14 +08:00 |
|
苏尹岚
|
ef7d9814fb
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-02 18:23:58 +08:00 |
|
苏尹岚
|
4e17b43a22
|
京东用户处理
|
2019-12-02 18:23:39 +08:00 |
|
gazebo
|
b6659baf72
|
分类重新排序时没有正确更新JdSyncStatus修复
|
2019-12-02 16:21:59 +08:00 |
|
苏尹岚
|
1f3ee86edd
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-02 16:15:14 +08:00 |
|
苏尹岚
|
73f8bfd28f
|
禁用京东用户
|
2019-12-02 16:14:56 +08:00 |
|
苏尹岚
|
7ec9a99cfb
|
同步错误返回
|
2019-12-02 15:42:01 +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 |
|
苏尹岚
|
410f671a36
|
冲突修改
|
2019-12-02 11:14:20 +08:00 |
|
苏尹岚
|
3c5afc31b6
|
接口位置移动，门店归属补漏修改，获取京东用户修改
|
2019-12-02 11:12:09 +08:00 |
|
gazebo
|
71bc871bdb
|
StoreSkuNameExt.Skus2改为Skus
|
2019-12-02 11:08:57 +08:00 |
|
苏尹岚
|
2836da8c94
|
同步错误返回
|
2019-12-02 08:20:05 +08:00 |
|
gazebo
|
36d964ef93
|
AutoSaleAtStr改为22:00:00
|
2019-12-01 17:03:44 +08:00 |
|
苏尹岚
|
c0b394f43d
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-29 17:52:28 +08:00 |
|
gazebo
|
ebb846dca8
|
GetStoresSkusNew中正确处理actVendorID
|
2019-11-29 15:06:14 +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 |
|
苏尹岚
|
fa843d3d1e
|
同步错误返回
|
2019-11-28 14:24:41 +08:00 |
|
苏尹岚
|
363b44a21c
|
同步错误返回
|
2019-11-28 14:15:57 +08:00 |
|
苏尹岚
|
2a486ea2ba
|
同步错误返回
|
2019-11-28 11:47:19 +08:00 |
|
苏尹岚
|
a041906c86
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-28 09:49:47 +08:00 |
|
gazebo
|
412fe44d32
|
按活动要求强制刷新商品平台价
|
2019-11-28 08:59:56 +08:00 |
|
gazebo
|
7410da75fd
|
+GetOrderPay
GetOrders添加参数isPurchase
|
2019-11-27 10:05:26 +08:00 |
|
苏尹岚
|
799c8232d7
|
同步错误返回
|
2019-11-26 18:26:16 +08:00 |
|