Commit Graph

1066 Commits

Author SHA1 Message Date
苏尹岚
dc700da08d Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-08 09:09:53 +08:00
gazebo
a69b5b3772 +Act.OverlapRule 2020-01-07 15:17:08 +08:00
苏尹岚
a0d833d4ae 操作日志 2020-01-07 11:03:07 +08:00
苏尹岚
16d2b0e3d2 Accept Merge Request #123: (yonghui -> mark)
Merge Request: 推荐商品
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/123
2020-01-07 10:31:28 +08:00
苏尹岚
f05fa6302f 推荐商品 2020-01-07 10:31:01 +08:00
苏尹岚
bba21e80a1 Accept Merge Request #122: (yonghui -> mark)
Merge Request: 推荐商品
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/122
2020-01-07 10:28:52 +08:00
苏尹岚
6d148fd0c8 推荐商品 2020-01-07 10:28:01 +08:00
gazebo
901b45690d fk 2020-01-07 09:50:47 +08:00
gazebo
3fabb0d952 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-07 09:43:41 +08:00
苏尹岚
103bce68ba 差评补款 2020-01-06 18:25:14 +08:00
gazebo
772c8f9cbe StoreSkuAct 2020-01-06 18:00:14 +08:00
苏尹岚
e0991f8609 畅销品查询 2020-01-06 16:37:36 +08:00
苏尹岚
f869a8e065 差评退款 2020-01-06 15:42:47 +08:00
gazebo
fda22fa2d4 SendVerifyCode 2020-01-06 15:36:33 +08:00
苏尹岚
ff0a3b3a02 显示中位价 2020-01-06 14:26:00 +08:00
gazebo
5d21158c7b SendVerifyCode时,如果是管理员,返回verifyCode 2020-01-06 12:13:28 +08:00
苏尹岚
71ba2e13db 显示中位价 2020-01-06 11:27:01 +08:00
苏尹岚
df6a0b1a1c 显示中位价 2020-01-06 10:46:51 +08:00
苏尹岚
b80b83aaef Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-06 10:13:52 +08:00
苏尹岚
754c190220 增加中位价 2020-01-06 10:13:31 +08:00
gazebo
dd7d226b16 fix bug in GetStoresMapList2 2020-01-06 09:30:10 +08:00
苏尹岚
b8bdea90f3 冲突处理 2020-01-06 08:54:48 +08:00
苏尹岚
36a46455ce 价格统计 2020-01-06 08:51:24 +08:00
gazebo
e89af0849e CaculateSkuEarningPrice中调用ConstrainPayPercentage
+RefreshOrdersPriceInfo
2020-01-03 15:56:02 +08:00
gazebo
516c9c5f85 fk 2020-01-03 14:30:33 +08:00
gazebo
7db6047c43 fk 2020-01-03 13:51:52 +08:00
gazebo
5dfb9aa2e3 SetSkuSyncStatus添加对于IsUseThingMap的处理 2020-01-03 11:09:54 +08:00
gazebo
8edf8897dc up 2020-01-03 11:01:11 +08:00
苏尹岚
c616808290 Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-03 10:54:36 +08:00
苏尹岚
22b8f16701 价格统计 2020-01-03 10:54:31 +08:00
gazebo
9c5f5956e1 用GetStoreSkuPriceAndWeight替换之前订单中更新订单商品信息逻辑 2020-01-03 10:36:54 +08:00
苏尹岚
15c1c347b2 Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-02 17:50:14 +08:00
苏尹岚
299dc1a883 价格统计 2020-01-02 17:49:57 +08:00
gazebo
6251228b6c 订单导出payPercentage 2020-01-02 17:39:03 +08:00
苏尹岚
7b8d37a6bd Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-02 16:59:20 +08:00
gazebo
df927137da 去掉Sku,SkuName和SkuCategory中的JdID与JdSyncStatus 2020-01-02 16:56:06 +08:00
苏尹岚
4eb559a4cb 差评 2020-01-02 16:32:02 +08:00
苏尹岚
3572cace45 价格统计 2020-01-02 15:32:24 +08:00
苏尹岚
b2ff93af36 价格统计 2020-01-02 15:30:36 +08:00
gazebo
ccfb852b58 up 2020-01-02 13:52:04 +08:00
gazebo
44bfc4a6ca up 2020-01-02 10:22:47 +08:00
gazebo
08f2c440f5 预售 2019-12-31 17:55:17 +08:00
苏尹岚
295854eb08 价格tongji 2019-12-31 17:22:15 +08:00
苏尹岚
3564b491f1 价格统计 2019-12-31 17:11:28 +08:00
苏尹岚
71c9a173b9 价格统计 2019-12-31 14:47:17 +08:00
苏尹岚
7c0e3a5e5c Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-31 13:31:53 +08:00
苏尹岚
0f2058de84 自动关注 2019-12-31 13:31:29 +08:00
gazebo
c6760a6bcc SyncStores 2019-12-31 11:50:45 +08:00
gazebo
229601c11e +onSysConfigChanged 2019-12-31 10:28:52 +08:00
gazebo
d3a02ef958 打包费参数有效性检查 2019-12-30 18:35:49 +08:00