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

935 Commits

Author SHA1 Message Date
gazebo
f710444cbf Store.ChangePriceType新增StoreChangePriceTypeManagedStore 2019-11-11 10:11:43 +08:00
gazebo
83f9493352 价格包参数添加priceAdd 2019-11-11 09:20:14 +08:00
gazebo
a7164bb511 添加User.Avatar 2019-11-08 17:32:46 +08:00
徐建华
29e6559e17 Accept Merge Request #22: (su -> mark) 
Merge Request: 刷新历史订单结算价
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/22
 2019-11-08 15:35:41 +08:00
gazebo
7d230ecf1e 修复删除饿百活动商品失败的bug 
在删除门店商品失败时，尝试设置不可售
 2019-11-08 15:24:51 +08:00
苏尹岚
29c92a0f12 Merge remote-tracking branch 'origin/mark' into su 2019-11-08 15:23:28 +08:00
gazebo
c5a01f1e9b 重构CalculateOrderDeliveryFee与QueryUserDeliveryAddress 2019-11-08 14:28:34 +08:00
苏尹岚
b417b731ff Merge remote-tracking branch 'origin/mark' into su 2019-11-08 11:54:21 +08:00
gazebo
f85c182f44 禁用与不同步的门店创建活动时排除 2019-11-08 09:01:59 +08:00
苏尹岚
ba2d403c73 对比程序修改 2019-11-07 09:14:56 +08:00
苏尹岚
8634f34ac5 对比差异程序修改 2019-11-07 08:55:37 +08:00
苏尹岚
5af2a702ed Merge remote-tracking branch 'origin/mark' into su 2019-11-07 08:55:09 +08:00
gazebo
0ca50bec4c GetStores精简模式下清除图片相关的信息 2019-11-07 08:52:00 +08:00
苏尹岚
c0f51a08aa Merge remote-tracking branch 'origin/mark' into su 2019-11-07 08:50:53 +08:00
苏尹岚
1edba57a60 对比差异测试 2019-11-07 08:14:36 +08:00
gazebo
aa4a24f1b6 修复getStoresSql中错用storeIDs的bug 2019-11-06 18:48:00 +08:00
gazebo
d7360648ec GetStores添加可选参数：briefLevel 2019-11-06 18:32:37 +08:00
gazebo
5015620015 +IsVendorRemote 2019-11-06 16:57:22 +08:00
gazebo
dc7d712ff6 up 2019-11-06 10:10:37 +08:00
gazebo
49a4b7b069 添加user2/GetSelfInfo 2019-11-06 10:00:36 +08:00
gazebo
8d7671f34d 微商城订单会自动上架商品 2019-11-06 09:38:37 +08:00
gazebo
c2393c17be 变更运营时，发送钉钉消息 2019-11-05 18:50:48 +08:00
gazebo
5512efaaf5 up 2019-11-05 18:08:40 +08:00
gazebo
444e3dadd9 尽量去除VendorIDWSC与VendorIDJX相关的无用代码 2019-11-05 17:21:21 +08:00
gazebo
6f23e9087b Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-11-04 18:41:16 +08:00
gazebo
af32f1f7bd syncStoreSkuNew中，因为京东平台以是否有库存表示是否关注，所以不论是否可售，都要设置库存 2019-11-04 18:40:49 +08:00
苏尹岚
094f774a8e Merge remote-tracking branch 'origin/mark' into su 2019-11-04 17:52:56 +08:00
苏尹岚
6302e38463 差异对比程序修改 2019-11-04 17:52:34 +08:00
gazebo
99868cd068 优化修改价格包时，更新门店商品同步状态的速度 2019-11-04 17:06:31 +08:00
gazebo
a09e3379f3 SendMsg2Somebod支持建议y 2019-11-04 16:03:31 +08:00
gazebo
ff4f636105 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-11-04 15:42:41 +08:00
gazebo
163087857a 对商品名进行trim 2019-11-04 15:41:41 +08:00
苏尹岚
e1b7f82be3 对比差异文件修改 2019-11-04 15:21:05 +08:00
苏尹岚
a7aee90c62 对比程序差异修改 2019-11-04 10:54:16 +08:00
苏尹岚
3c0017c338 Merge remote-tracking branch 'origin/mark' into su 2019-11-04 09:48:55 +08:00
苏尹岚
f344d711bf 对比差异程序修改 2019-11-04 09:48:21 +08:00
gazebo
7a1972680b 改价格包时，不用事务 2019-11-01 21:02:00 +08:00
苏尹岚
4e3b9b97d3 Merge remote-tracking branch 'origin/mark' into su 2019-11-01 15:31:58 +08:00
苏尹岚
4d605195ac 订单统计接口修改，对比差异程序修改 2019-11-01 15:31:29 +08:00
gazebo
28c0c5a393 多门店平台没有创建的商品，删除门店商品时的错误处理 
在设置删除门店商品时，必须要是skuname或sku不存在的商品时会设置删除日期
 2019-11-01 15:23:39 +08:00
gazebo
f4e29f719a 限制门店老板直接修改门店改价属性为：StoreChangePriceTypeBossDisabled的门店商品价格 2019-10-31 18:36:19 +08:00
gazebo
3812a60866 Merge branch 'mark' into su 2019-10-31 15:50:59 +08:00
gazebo
36a505fb32 只有库中可售的商品才可以关注 2019-10-31 15:49:17 +08:00
苏尹岚
e9607ac921 tijiao 2019-10-31 13:55:29 +08:00
苏尹岚
5431abaddf Merge remote-tracking branch 'origin/mark' into su 2019-10-31 11:59:30 +08:00
gazebo
bd0694ca32 每晚自动同步时，排除禁用门店 2019-10-31 09:30:37 +08:00
gazebo
3bd84cff45 SyncSkus中的管理策略修改 2019-10-30 17:35:35 +08:00
苏尹岚
510a1b11af 对比京西和平台差异修改 2019-10-30 10:27:35 +08:00
gazebo
8281dfb19d debug CompareJxAndVendor 2019-10-28 16:19:48 +08:00
gazebo
8154d131f7 checkRemoteCatExist中，只根据code来判断 2019-10-27 23:00:51 +08:00