Rosy-zhudan
|
dab0452531
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-10-10 09:43:15 +08:00 |
|
Rosy-zhudan
|
1c5c0bbbcc
|
修改反馈
|
2019-10-10 09:42:41 +08:00 |
|
gazebo
|
de09aeaedd
|
Store添加字段AutoEnableAt
|
2019-10-10 09:20:57 +08:00 |
|
Rosy-zhudan
|
de617fbc49
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-10-10 08:45:07 +08:00 |
|
gazebo
|
3855e79809
|
用户修改属性时的最后修改人从jxadmin改为用户id
用户注册时也记录相应的最后登录信息
|
2019-10-09 11:06:08 +08:00 |
|
Rosy-zhudan
|
aa6e94be89
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-10-09 08:45:50 +08:00 |
|
gazebo
|
78a2c4270a
|
GetStoresOrderSaleInfo相关的时间，改为订单创建时间，售后单还是以售后结束时间
|
2019-10-08 15:26:58 +08:00 |
|
gazebo
|
34506d08a9
|
添加Store.OperatorPhone2
门店搜索支持电话号码
|
2019-10-08 14:18:44 +08:00 |
|
Rosy-zhudan
|
0079a04817
|
重构警告等级
|
2019-09-30 18:55:46 +08:00 |
|
gazebo
|
b11e2e5d1e
|
检查上传的图片尺寸是否符合要求
|
2019-09-30 17:06:47 +08:00 |
|
Rosy-zhudan
|
ec6565992f
|
门店红线-写入和统计数据
|
2019-09-30 10:45:29 +08:00 |
|
gazebo
|
a41a00d069
|
添加API：cms/GetCityBankBranches
|
2019-09-30 10:05:08 +08:00 |
|
Rosy-zhudan
|
b9e0145cd5
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-29 18:33:38 +08:00 |
|
Rosy-zhudan
|
1ef5d248e8
|
门店红线/黄线统计-写入数据库
|
2019-09-29 18:32:55 +08:00 |
|
gazebo
|
7d03337e50
|
dao.GetStoreDetail针对VendorIDJX特殊处理
|
2019-09-29 17:51:57 +08:00 |
|
gazebo
|
de9bebf958
|
添加GoodsOrder.DeliveryFeeFrom表示三方运单计算参考起始时间
重构平台添加小费及三方配送召唤逻辑
|
2019-09-29 17:08:03 +08:00 |
|
Rosy-zhudan
|
55548ced11
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-29 08:44:36 +08:00 |
|
gazebo
|
2acc0f06dd
|
transactionWarningSeconds报警时间改为2分钟
|
2019-09-28 07:44:43 +08:00 |
|
gazebo
|
ad86261ea5
|
京西自营改为京西商城
|
2019-09-27 18:46:30 +08:00 |
|
Rosy-zhudan
|
7b89b528c3
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-27 18:04:57 +08:00 |
|
Rosy-zhudan
|
0c0ac4fd69
|
触犯红线通知
|
2019-09-27 17:59:39 +08:00 |
|
gazebo
|
4af8ebd8ef
|
不需要客户端再主动调用RegisterDataResource了，RegisterDataResource改为空操作
|
2019-09-27 16:56:51 +08:00 |
|
Rosy-zhudan
|
6f579e7f1b
|
门店触犯红线通知
|
2019-09-27 16:30:18 +08:00 |
|
gazebo
|
2ed3b3fa64
|
tempop.CheckImages
|
2019-09-27 12:08:27 +08:00 |
|
Rosy-zhudan
|
a7b2dc3abd
|
门店红线警告
|
2019-09-27 10:36:34 +08:00 |
|
gazebo
|
366a6afc63
|
去掉对于SkuName.DescImgEbai的使用
|
2019-09-27 09:32:25 +08:00 |
|
gazebo
|
88fa351cbb
|
将DataResource.IsVendor改为UseType
|
2019-09-27 09:23:11 +08:00 |
|
gazebo
|
b88aa22b40
|
去除对于SkuName.ImgHashCode的依赖
|
2019-09-26 21:02:42 +08:00 |
|
gazebo
|
8a1d364e4e
|
商品详情描述图片加入DataResource管理，老数据还未迁移
|
2019-09-26 20:55:08 +08:00 |
|
gazebo
|
998c087d9f
|
同步时不使用SkuName.ImgEbai
|
2019-09-26 19:40:51 +08:00 |
|
gazebo
|
14961bd9f1
|
fix DataResource.ResoureType为ResourceType
|
2019-09-26 18:06:14 +08:00 |
|
gazebo
|
c6c9eab9ba
|
fk
|
2019-09-26 08:44:46 +08:00 |
|
gazebo
|
97556194d0
|
修复GetNeedUploadDataResource中的bug
|
2019-09-26 08:42:38 +08:00 |
|
gazebo
|
7f46072cc5
|
- 将skuName中的图片外移至dataResource
|
2019-09-26 08:35:26 +08:00 |
|
gazebo
|
41866bf4b2
|
商品支持有两张图片
|
2019-09-25 14:57:45 +08:00 |
|
gazebo
|
84740c33f0
|
售后方式强制显示成退款
|
2019-09-25 13:50:27 +08:00 |
|
gazebo
|
1fe347275a
|
DataResource.MainURL改为唯一索引
|
2019-09-25 12:03:30 +08:00 |
|
gazebo
|
d25b096353
|
- GetAfsOrders添加参数skuIDs
|
2019-09-25 11:16:51 +08:00 |
|
gazebo
|
15d16c41a6
|
删除分类调价比例
|
2019-09-25 10:28:54 +08:00 |
|
gazebo
|
4e63f526f2
|
去掉SkuName的ElmImgHashCode与ImgWeimob
|
2019-09-25 10:05:31 +08:00 |
|
gazebo
|
bf86235ce2
|
- 添加用户最后登录信息
|
2019-09-24 18:09:32 +08:00 |
|
gazebo
|
412b11396a
|
- 注释掉老user与auth相关的代码
|
2019-09-24 16:39:50 +08:00 |
|
gazebo
|
9b1d282c82
|
- 重构dao.Sku
|
2019-09-24 10:55:13 +08:00 |
|
gazebo
|
041bb9ca87
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-23 18:26:57 +08:00 |
|
gazebo
|
c6ae8e830d
|
- 京西商城发送假订单消息时，不直接修改改订单状态
|
2019-09-23 18:26:11 +08:00 |
|
Rosy-zhudan
|
4b7fe79245
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-23 16:58:39 +08:00 |
|
Rosy-zhudan
|
2814b0c55a
|
得到门店总分排名
|
2019-09-23 16:58:02 +08:00 |
|
gazebo
|
9ea9e484a7
|
- 不用GROUP BY重新实现GetStores
|
2019-09-23 16:47:10 +08:00 |
|
gazebo
|
06a155daf2
|
- 对于长时间未提交事务报警
|
2019-09-21 22:06:08 +08:00 |
|
gazebo
|
b5e28a280f
|
- 将长时间没有提交的事务打印出来
|
2019-09-21 17:31:44 +08:00 |
|