Commit Graph

1085 Commits

Author SHA1 Message Date
gazebo
08c2d82cbe UpdateActPrice4StoreSkuNameNew中bug修复 2020-01-14 14:50:00 +08:00
苏尹岚
2f7cd0bb5a Accept Merge Request #51: (su -> mark)
Merge Request: 同步错误返回
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/51
2020-01-09 17:53:37 +08:00
苏尹岚
e430c8ae59 同步错误返回 2020-01-09 17:53:13 +08:00
苏尹岚
08be46ca02 同步错误 2020-01-09 17:44:28 +08:00
苏尹岚
5938092d0f 自动关注畅销品 2020-01-09 15:31:39 +08:00
苏尹岚
8f78abc97d 冲突处理 2020-01-09 14:45:51 +08:00
苏尹岚
20fc83000e 改规格->改价 2020-01-09 14:42:39 +08:00
gazebo
580b3c735f dao.QueryActs改参数skuID为skuIDs 2020-01-09 14:15:07 +08:00
苏尹岚
cda6d91dae Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-09 10:32:28 +08:00
gazebo
506eb7c929 dao.GetStoreSkus和dao.GetFullStoreSkus忽略sku与skuName的状态检查 2020-01-09 10:13:19 +08:00
苏尹岚
8f7e1fd1bb 操作日志 2020-01-09 08:31:44 +08:00
苏尹岚
fbabc83524 Accept Merge Request #131: (yonghui -> mark)
Merge Request: 增加同步返回错误
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/131
2020-01-08 18:09:56 +08:00
苏尹岚
7101582522 增加同步错误 2020-01-08 18:09:04 +08:00
苏尹岚
e5db4f27b1 操作日志 2020-01-08 14:26:31 +08:00
gazebo
510b9e8483 修复处理投递失败的BUG 2020-01-08 11:38:46 +08:00
gazebo
9c6b27ed56 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-08 10:39:19 +08:00
gazebo
4a51bfca9b +StoresOrderSaleInfo.DistanceFreightMoney, WaybillTipMoney 2020-01-08 10:38:08 +08:00
苏尹岚
5fed851b8d 修改索引 2020-01-08 09:47:09 +08:00
苏尹岚
f5e8860b0a 删除事务,修改索引 2020-01-08 09:46:05 +08:00
苏尹岚
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