gazebo
|
7946ab6207
|
mtps回调优化
|
2019-10-11 09:42:28 +08:00 |
|
gazebo
|
4ea0fc4f93
|
京西商城售后单类型精简
|
2019-10-11 09:40:28 +08:00 |
|
gazebo
|
9a840b9c9b
|
京西商城售后流程
|
2019-10-11 09:04:07 +08:00 |
|
gazebo
|
e6aa0feda1
|
CaculateSkuVendorPrice最低价是一分钱
|
2019-10-10 17:10:51 +08:00 |
|
gazebo
|
e131cb1309
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-10-10 16:24:23 +08:00 |
|
gazebo
|
fe35951287
|
优化OnOrderComments
|
2019-10-10 16:22:58 +08:00 |
|
zhudan
|
ed877c246b
|
Accept Merge Request #9: (don -> mark)
Merge Request: 门店触犯红线通知
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/9
|
2019-10-10 10:12:26 +08:00 |
|
gazebo
|
90bffc3757
|
处理只单独修改门店AutoEnableAt的情况
|
2019-10-10 09:55:33 +08:00 |
|
gazebo
|
c8f702a861
|
up
|
2019-10-10 09:44:31 +08:00 |
|
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
|
c237c4957c
|
修改临时休息自动恢复逻辑，兼容之前没有设置恢复营业时间的情况
|
2019-10-10 09:40:48 +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
|
0bcc7ebb1a
|
京西商城订单三方配送费最高直接设置为20元
|
2019-10-09 17:58:06 +08:00 |
|
gazebo
|
3855e79809
|
用户修改属性时的最后修改人从jxadmin改为用户id
用户注册时也记录相应的最后登录信息
|
2019-10-09 11:06:08 +08:00 |
|
Rosy-zhudan
|
83349188fc
|
修正
|
2019-10-09 09:50:47 +08:00 |
|
Rosy-zhudan
|
aa6e94be89
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-10-09 08:45:50 +08:00 |
|
gazebo
|
1c7edc4b86
|
修复getStoresSql中对于角色查询条件的bug
|
2019-10-08 17:05:14 +08:00 |
|
gazebo
|
78a2c4270a
|
GetStoresOrderSaleInfo相关的时间，改为订单创建时间，售后单还是以售后结束时间
|
2019-10-08 15:26:58 +08:00 |
|
gazebo
|
38cad2db49
|
GetOrders添加可选参数isJxFirst
|
2019-10-08 14:35:09 +08:00 |
|
gazebo
|
34506d08a9
|
添加Store.OperatorPhone2
门店搜索支持电话号码
|
2019-10-08 14:18:44 +08:00 |
|
gazebo
|
55aeeacc40
|
发送新售后单消息时用错售后单创建时间字段
重新收到新售后单消息的处理的BUG修复。但当前京东订单不正常的收到重复售后单消息没有实际解决（比如订单：923795309000741，售后单：24078668）
|
2019-10-03 22:09:12 +08:00 |
|
gazebo
|
9e135dfedf
|
修复skuList2Map中没有COPY SKU的bug
|
2019-10-03 09:48:32 +08:00 |
|
Rosy-zhudan
|
0079a04817
|
重构警告等级
|
2019-09-30 18:55:46 +08:00 |
|
gazebo
|
b11e2e5d1e
|
检查上传的图片尺寸是否符合要求
|
2019-09-30 17:06:47 +08:00 |
|
gazebo
|
22693ea969
|
fk
|
2019-09-30 14:13:37 +08:00 |
|
gazebo
|
9eca49c7e1
|
设置可售时修改最后修改时间与修改人
|
2019-09-30 12:15:56 +08:00 |
|
gazebo
|
e876031a21
|
修复在活动中强行添加VendorIDJX导致的bug
|
2019-09-30 12:10:15 +08:00 |
|
gazebo
|
ff9c21fbe4
|
活动异常调试
|
2019-09-30 12:03:09 +08:00 |
|
gazebo
|
919f9e303e
|
抓取网页门店数据的任务，在beta上每天04:05:06执行
|
2019-09-30 11:01:27 +08:00 |
|
Rosy-zhudan
|
ec6565992f
|
门店红线-写入和统计数据
|
2019-09-30 10:45:29 +08:00 |
|
gazebo
|
2897200c89
|
蟹券的售后直接拒绝
|
2019-09-30 10:11:15 +08:00 |
|
gazebo
|
833e1a3359
|
自动拒绝蟹券售后请求
|
2019-09-30 10:06:06 +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
|
4c6cdc4e97
|
活动创建平台添加京西
|
2019-09-29 17:19:12 +08:00 |
|
gazebo
|
de9bebf958
|
添加GoodsOrder.DeliveryFeeFrom表示三方运单计算参考起始时间
重构平台添加小费及三方配送召唤逻辑
|
2019-09-29 17:08:03 +08:00 |
|
gazebo
|
601db3f0ce
|
格式化运单电话
|
2019-09-29 16:57:51 +08:00 |
|
gazebo
|
b583d54b32
|
因为京东最近会晚发接单消息，模拟一下
|
2019-09-29 11:06:36 +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 |
|
gazebo
|
98cf374225
|
订单打印从VendorPrice改为SalePrice
|
2019-09-27 18:32:12 +08:00 |
|
gazebo
|
1922aed876
|
京西平台订单也要依据门店中的设置分成
|
2019-09-27 18:23:36 +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 |
|