苏尹岚
|
c191436968
|
去掉验证token
|
2020-01-07 09:02:35 +08:00 |
|
苏尹岚
|
33f2e2b74d
|
差评扣款
|
2020-01-07 08:26:13 +08:00 |
|
苏尹岚
|
103bce68ba
|
差评补款
|
2020-01-06 18:25:14 +08:00 |
|
苏尹岚
|
e4b8d1da21
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-06 17:47:03 +08:00 |
|
gazebo
|
c331ae3996
|
fk
|
2020-01-06 17:30:36 +08:00 |
|
gazebo
|
c92996a1d9
|
up
|
2020-01-06 16:54:54 +08:00 |
|
苏尹岚
|
14b45ee277
|
畅销品
|
2020-01-06 16:51:05 +08:00 |
|
苏尹岚
|
93c42824aa
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-06 16:37:52 +08:00 |
|
苏尹岚
|
e0991f8609
|
畅销品查询
|
2020-01-06 16:37:36 +08:00 |
|
gazebo
|
170cd63936
|
RegisterUser支持token
|
2020-01-06 16:36:52 +08:00 |
|
苏尹岚
|
54ad61d578
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-06 15:43:02 +08:00 |
|
苏尹岚
|
f869a8e065
|
差评退款
|
2020-01-06 15:42:47 +08:00 |
|
gazebo
|
fda22fa2d4
|
SendVerifyCode
|
2020-01-06 15:36:33 +08:00 |
|
gazebo
|
483aa6df20
|
IsAdmin
|
2020-01-06 15:24:59 +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 |
|
苏尹岚
|
6f0a3bc971
|
显示中位价
|
2020-01-06 11:11:37 +08:00 |
|
苏尹岚
|
3bd34ce8a5
|
显示中位价
|
2020-01-06 11:08:16 +08:00 |
|
苏尹岚
|
a5ea3ebd3d
|
显示中位价
|
2020-01-06 10:51:54 +08:00 |
|
苏尹岚
|
df6a0b1a1c
|
显示中位价
|
2020-01-06 10:46:51 +08:00 |
|
苏尹岚
|
6fb43fa553
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-06 10:27:57 +08:00 |
|
gazebo
|
a07209c86d
|
更新美团 cookie
SyncStore2添加isManageIt
|
2020-01-06 10:21:54 +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
|
152844a9f4
|
up
|
2020-01-06 09:39:34 +08:00 |
|
gazebo
|
dd7d226b16
|
fix bug in GetStoresMapList2
|
2020-01-06 09:30:10 +08:00 |
|
gazebo
|
c47fc8e8e3
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2020-01-06 09:19:01 +08:00 |
|
gazebo
|
64cf14a04c
|
京东每晚同步不全同步
|
2020-01-06 09:15:32 +08:00 |
|
苏尹岚
|
f6b7c7cb0c
|
Accept Merge Request #120: (yonghui -> mark)
Merge Request: 价格处理
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/120
|
2020-01-06 09:12:29 +08:00 |
|
gazebo
|
3164ee994e
|
启用门店打包费
|
2020-01-06 09:11:20 +08:00 |
|
苏尹岚
|
b8bdea90f3
|
冲突处理
|
2020-01-06 08:54:48 +08:00 |
|
苏尹岚
|
36a46455ce
|
价格统计
|
2020-01-06 08:51:24 +08:00 |
|
gazebo
|
13922ead60
|
京东活动重构，删除与添加时遇错继续
|
2020-01-03 17:29:42 +08:00 |
|
gazebo
|
e89af0849e
|
CaculateSkuEarningPrice中调用ConstrainPayPercentage
+RefreshOrdersPriceInfo
|
2020-01-03 15:56:02 +08:00 |
|
gazebo
|
d7aa244528
|
jd act
|
2020-01-03 15:47:41 +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 |
|
gazebo
|
8cfbf4fcf9
|
warning当GetStoreSkuPriceAndWeight返回错误时在updateOrderSkuOtherInfo与updateAfsOrderSkuOtherInfo中
|
2020-01-03 10:56:43 +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 |
|
gazebo
|
2f6a983dcd
|
checkActUpdate
|
2020-01-03 09:00:43 +08:00 |
|
gazebo
|
11eed26443
|
删除旧的活动规则校验
|
2020-01-02 18:38:06 +08:00 |
|
gazebo
|
22959ce4ad
|
修改活动校验规则
|
2020-01-02 18:28:01 +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 |
|