Commit Graph

4405 Commits

Author SHA1 Message Date
苏尹岚
adf4407e93 根据skuid批量关注 2020-01-10 11:14:53 +08:00
苏尹岚
d594f137f7 Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-09 15:31:51 +08:00
苏尹岚
5938092d0f 自动关注畅销品 2020-01-09 15:31:39 +08:00
苏尹岚
7bc490c7e8 根据skuid关注商品 2020-01-09 15:14:15 +08:00
苏尹岚
3f151a07c5 Accept Merge Request #132: (yonghui -> mark)
Merge Request: 改规格->改价
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/132
2020-01-09 14:47:11 +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
gazebo
59d21cce7f updateStoresSkusWithoutSync 2020-01-09 12:01:54 +08:00
苏尹岚
da3c177e54 build失败处理 2020-01-09 11:00:10 +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
gazebo
2629779e6d up 2020-01-09 09:58:48 +08:00
苏尹岚
8f7e1fd1bb 操作日志 2020-01-09 08:31:44 +08:00
gazebo
27e13ecb99 fk 2020-01-08 18:40:39 +08:00
gazebo
ce41890da7 alipayAppID 2020-01-08 18:36:55 +08:00
gazebo
3ea689951b updateStoresSkusWithoutSync中改价是判断价格是否一致 2020-01-08 18:32:29 +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
gazebo
c196e7aab9 添加支付宝登录方式:alipaycode 2020-01-08 18:06:53 +08:00
苏尹岚
e5db4f27b1 操作日志 2020-01-08 14:26:31 +08:00
gazebo
510b9e8483 修复处理投递失败的BUG 2020-01-08 11:38:46 +08:00
gazebo
a56a5b1ec7 OrderSkuDiscountTypeTe 2020-01-08 11:12:12 +08:00
苏尹岚
68494268ce Accept Merge Request #130: (yonghui -> mark)
Merge Request: 根据skuid部分关注
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/130
2020-01-08 10:43:01 +08:00
苏尹岚
a3e4503081 根据skuid部分关注 2020-01-08 10:42:34 +08:00
苏尹岚
256c00d31b Accept Merge Request #129: (yonghui -> mark)
Merge Request: 根据skuid 部分关注
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/129
2020-01-08 10:41:14 +08:00
gazebo
9c6b27ed56 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-08 10:39:19 +08:00
苏尹岚
82eb16ba66 商品部分关注 2020-01-08 10:39:16 +08:00
gazebo
b92cff3338 !token改为7部分 2020-01-08 10:38:55 +08:00
gazebo
4a51bfca9b +StoresOrderSaleInfo.DistanceFreightMoney, WaybillTipMoney 2020-01-08 10:38:08 +08:00
苏尹岚
d7ae6eb9a2 屏蔽接口 2020-01-08 10:30:03 +08:00
苏尹岚
296d877d55 批量关注修改 2020-01-08 10:20:50 +08:00
苏尹岚
5fed851b8d 修改索引 2020-01-08 09:47:09 +08:00
苏尹岚
f5e8860b0a 删除事务,修改索引 2020-01-08 09:46:05 +08:00
苏尹岚
743238b9ec 查询修改 2020-01-08 09:28:45 +08:00
苏尹岚
f7d89c8fe3 查询优化 2020-01-08 09:25:08 +08:00
苏尹岚
aa84f7ae31 根据skuID部分关注 2020-01-08 09:15:20 +08:00
苏尹岚
dc700da08d Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-08 09:09:53 +08:00
gazebo
a47f7cd845 CreateAct.OverlapRulep 2020-01-07 18:30:31 +08:00
gazebo
7183d58554 up 2020-01-07 15:21:52 +08:00
gazebo
a69b5b3772 +Act.OverlapRule 2020-01-07 15:17:08 +08:00
gazebo
26ca0bc01d 京西商城订单暂时不支持付款后取消 2020-01-07 14:29:29 +08:00
gazebo
5ad41fe621 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-07 13:38:35 +08:00
gazebo
8f8a8d304f BuyerCancelOrder 2020-01-07 13:36: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
gazebo
4ca6723fa2 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-07 10:30:04 +08:00
gazebo
11dd554561 BuyerCancelOrder 2020-01-07 10:29:51 +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