苏尹岚
|
19ce032a72
|
Merge remote-tracking branch 'origin/mark' into su
|
2020-01-14 18:34:58 +08:00 |
|
gazebo
|
b9f74f8a13
|
+api UploadFakeJdThingMap
|
2020-01-14 17:37:13 +08:00 |
|
苏尹岚
|
255a6945b0
|
操作记录表索引修改
|
2020-01-14 16:51:58 +08:00 |
|
苏尹岚
|
dbc1fb7cd2
|
操作记录表索引修改
|
2020-01-14 16:51:58 +08:00 |
|
苏尹岚
|
07458141e6
|
操作日志记录（beta）-门店商品
|
2020-01-14 16:51:58 +08:00 |
|
苏尹岚
|
7d57fa54b4
|
Accept Merge Request #140: (yonghui -> mark)
Merge Request: 订单详情增加用户信息
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/140
|
2020-01-13 18:26:19 +08:00 |
|
苏尹岚
|
0178156c65
|
订单详情增加用户信息
|
2020-01-13 18:18:58 +08:00 |
|
gazebo
|
975d204bfb
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2020-01-13 17:55:57 +08:00 |
|
苏尹岚
|
fa899540f9
|
中位价价格算法修改，乘除换一下
|
2020-01-13 16:43:06 +08:00 |
|
苏尹岚
|
8c9b4081c8
|
推荐商品自动关注，修改，以及暂时只整4个小城市
|
2020-01-13 14:53:40 +08:00 |
|
gazebo
|
d29b7b3686
|
globals.IsStoreSkuAct控制是否添加门店商品的平台活动信息
|
2020-01-13 14:17:50 +08:00 |
|
苏尹岚
|
ce74fb7128
|
畅销品查询终极修改
|
2020-01-13 12:51:14 +08:00 |
|
gazebo
|
21accbf8fe
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2020-01-13 10:43:51 +08:00 |
|
gazebo
|
b60d792194
|
UpdateActPrice4StoreSkuNameNew中bug修复
|
2020-01-13 10:42:26 +08:00 |
|
苏尹岚
|
93d1c46408
|
畅销品查询修改
|
2020-01-13 09:56:42 +08:00 |
|
苏尹岚
|
78fcdeaf39
|
查询推荐品，新增活动系列字段
|
2020-01-13 09:03:02 +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 |
|