订单列表优化
拉取站点可配送地区信息
接口名： /station/area_dict
功能： 拉取站点可配送地区信息
Method：GET
请求：
响应：
code M int 返回码，0表示成功，其他表示错误
msg M string 错误信息
data M list 站点对应的可配送地区信息
示例：
request
http://station.guanmai.cn/station/area_dict
response
{
"code": 0,
"msg": "ok",
"data": [{
"city": "深圳市"
"city_id": "440300"
"districts": [{
"district": "南山区"
"district_id": "30200000000"
"areas": [
{
"area": "南山中心区"
"area_id": "30200100000"
},
{
"area": "华侨城"
"area_id": "30200200000"
},
{
"area": "南油"
"area_id": "30200300000"
},
{
"area": "蛇口"
"area_id": "30200400000"
},
{
"area": "白石洲"
"area_id": "30200500000"
},
{
"area": "前海"
"area_id": "30200600000"
},
{
"area": "南头"
"area_id": "30200700000"
},
{
"area": "西丽"
"area_id": "30200800000"
},
{
"area": "科技园"
"area_id": "30200900000"
},
]
}]
}]
}
使用搜索拉取站点订单时，加入地区过滤，加入新的排序方式，添加新的返回字段
接口名：/station/orders
Method：GET
请求：
query_type M int 搜索类型 [1: 按照下单时间搜索，2: 按照运营周期搜索，3: 按照收货日期搜索]
if query_type == 1
start_date M string 开始下单日期(精确到天)
end_date M string 截止下单日期(精确到天)
if query_type == 2
time_config_id M string 时间配置ID
cycle_start_time M string 开始周期时间(精确到分钟)
cycle_end_time M string 结束周期时间(精确到分钟)
if query_type == 3
receive_start_date M string 开始收货日期(精确到天)
receive_end_date M string 结束收货日期(精确到天)
search_text M string 搜索内容
search_area(新增) O string 搜索地区(通过'_'来拼接市,区,街道三级编号，其中任意一级信息可向后全部缺省)
sort_type O string 排序类型(date_desc日期倒序(默认);date_asc日期升序;price_desc价格倒序;price_asc价格升序
新增：
addr_desc商户倒序;addr_asc商户升序;freight_desc运费倒序;freight_asc运费升序;
status_desc订单状态倒序;status_asc订单状态升序;
)
status O int 订单状态
offset O int 分页offset
limit O int 分页limit
响应：
code M int 返回码，0表示成功，其他表示错误
msg M string 错误信息
data M list 订单列表数据，数据字段为订单表字段；
示例：
request:
http://station.dev.guanmai.cn/station/orders?query_type=1&start_date=2017-05-01&end_date=2017-05-07&search_text=&search_area=深圳市_南山区_科技园&offset=0&limit=20
返回结果中新增了六个字段
sale_money 销售额（不含运费
sale_money_with_freight 销售额（含运费
real_money 出库金额
abnormal_money 异常金额
refund_money 实退金额
refund_kind 退货商品种类的数量
response：
{
"code": 0,
"data": {
"pagination": {
"offset": 0,
"count": 8,
"limit": 20
},
"list": [
{
"driver_id": 『新增』,
"driver_name": 『新增』,
"freight": 20,
"details": [
{
"sync_origin_id": "D805892",
"spu_id": "C00935",
"total_item_pay": 25.76,
"accept_quantity": 7,
"version": 55,
"quantity": 7,
"spu_remark": "",
"real_item_price": 25.76,
"total_item_price": 25.76,
"sale_price": 3.68,
"id": "D805892",
"real_quantity": 7
}
],
"time_config_info": {
"_id": "ST001",
"desc": "小农女默认服务时间",
"final_distribute_time": "06:00",
"order_time_limit": {
"end": "02:00",
"start": "06:00",
"e_span_time": 1
},
"type": 0,
"task_begin_time": "06:00",
"final_distribute_time_span": 1,
"receive_time_limit": {
"end": "23:30",
"receiveTimeSpan": "30",
"start": "06:00",
"s_span_time": 6,
"e_span_time": 6
},
"service_time_creator": "T001",
"name": "小农女默认服务时间"
},
"customer": {
"receiver_phone": "产品技术测试1111111",
"address": "产品技术测试1111111",
"station_id": "",
"new_consumer": 0,
"address_id": "10936",
"salemenu_id": "",
"receiver_name": "产品技术测试1111111",
"extender": {
"resname": "产品技术测试1111111"
},
"id": "22953"
},
"receive_end_time": "2016-10-16 23:30",
"status": 1,
"origin_total_price": 25.76,
"date_time": 1476065329.588,
"receive_begin_time": "2016-10-16 06:00",
"station_id": "T002",
"id": "PL316094",
"date_time_str": "2016-10-10 10:08:49",
"total_price": 25.76
},
]
},
"msg": "ok"
}
/station/order/edit/{{order_id}} 拉取订单详情
接口名：/station/order/edit/{{order_id}}
Method：GET
请求：
order_id M string 订单ID
响应：
code M int 返回码，0表示成功，其他表示错误
msg M string 错误信息
data M dict 订单详情数据，数据字段为订单表字段；
示例：
request
http://station.guanmai.cn/station/order/edit/PL12345
// 新增字段： is_weigh 是否称重 布尔类型
// exc_quantity 异常数量 int
// 出库金额： real_quantity int
response
{
"code": 0,
"data": {
"source_order_ids": [],
"freight": 2000,
"time_config_id": "ST001",
"customer": {
"receiver_phone": "18682285748",
"address": "小梅沙 海琴路23号 (师傅尽量在10点过后去 不要太早，谢谢)",
"uid": "16934",
"receive_end_time": "2016-10-16 23:30",
"address_id": "8219",
"receiver_name": "邓生",
"extender": {
"resname": "正宗粉面馆",
"order_pay_method": 2
},
"address_sign_id": "30700100000",
"receive_begin_time": "2016-10-16 06:00",
"supply_station_id": "T002"
},
"status": 1,
"origin_total_price": 17460,
"_abnormal_lock": "no",
"_id": "PL316101",
"salemenu_ids": [
"S0520"
],
"total_pay": 14300,
"details": [
{
"spu_id": "C00035",
"category_title_2": "叶菜类",
"accept_quantity": 1,
"version": 311,
"name": "上海青|中条|优质|件",
"quantity": 1,
"sync_origin": "D804813",
"sale_ratio": 45,
"real_item_price": 12300,
"sale_unit_name": "件",
"total_item_price": 12300,
"category_title_1": "蔬菜",
"std_unit_name": "斤",
"id": "D804813",
"real_quantity": 1,
"supplier_name": "小农女",
"total_item_pay": 12300,
"sale_num_least": 1,
"purchase_quantity": 1,
"origins": [],
"spu_remark": "test",
"salemenu_id": "S0520",
"sale_price": 123
}
],
"_lock": "no",
"fake_total_price": 17460,
"time_config_info": {
"_id": "ST001",
"desc": "小农女默认服务时间",
"final_distribute_time": "06:00",
"order_time_limit": {
"end": "02:00",
"start": "06:00",
"e_span_time": 1
},
"type": 0,
"task_begin_time": "06:00",
"final_distribute_time_span": 1,
"receive_time_limit": {
"end": "23:30",
"receiveTimeSpan": "30",
"start": "06:00",
"s_span_time": 6,
"e_span_time": 6
},
"service_time_creator": "T001",
"name": "小农女默认服务时间"
},
"district_code": "440300",
"sort_id": 0,
"date_time": "2016-10-10T12:01:52.789",
"is_aggregation": 0,
"station_id": "T002",
"remark": null,
"real_price": 17460,
"total_price": 12300
},
"msg": "ok"
}
确认合单时增加提示信息
station 部分
接口名：/station/order/create
Method：GET
请求：
details M string 商品相关的json数据
address_id M int 商户SID
uid M int 商户UID
receive_begin_time M string 订单收货开始时间
receive_end_time M string 订单收货结束时间
time_config_id string 时间配置ID
force O int 是否强制合单标志，0-不合单，新建一个订单；1-强制合单；
响应：
code M int 返回码，0表示成功，其他表示错误
msg M string 错误信息
data M list 新建的订单ID或者更改的订单ID数据
示例：
request
http://station.guanmai.cn/station/order/create
POST参数：
details: [{"sku_id":"D804813","amount":1,"unit_price":123,"spu_remark":"666","spu_id":"C00035"}]
address_id: 20508
uid: 25512
receive_begin_time: 2016-10-16 06:00
receive_end_time: 2016-10-16 23:30
time_config_id: ST001
当存在可合并订单时，在返回值data中新增如下字段
response
{
"data": [
{
"order_id": "PL637312",
"date_time": "2017-11-03 14:52:06" (新增)
}
],
"code": 10,
"msg": "该商户今日存在可合并订单"
}
bshop 部分
接口名：/order/confirm
Method：GET
返回结果中添加''data_time'字段，表示可合单的订单创建时间
新的生成Excel表逻辑与格式
接口名： /station/sales_analysis/orderdetail
Method：GET
添加 'search_area' 查询字段
返回结果为Excel文件
拉取商家对应的报价单信息
使用如下接口
/salemenu/sale/list
按商品查看新增按销售单过滤功能，合并三个搜索框功能，增加使用不同周期过滤的字段
接口名：/station/order/order_sku_list
Method：GET
请求：
query_type M int 搜索类型 [1: 按照下单时间搜索，2: 按照运营周期搜索，3: 按照收货日期搜索]
if query_type == 1
start_date M date 开始下单日期(精确到天)
end_date M date 截止下单日期(精确到天)
if query_type == 2
time_config_id M string 时间配置ID
start_date M date 开始周期时间(精确到分钟)
end_date M date 结束周期时间(精确到分钟)
if query_type == 3
start_date M date 开始收货日期(精确到天)
end_date M date 结束收货日期(精确到天)
// sku_text O string 商品id或商品名
// customer_text O string 商户id或商户名
// order_id O string 订单号
search_text O string 搜索内容，为上三个字段的合并功能
status O string 订单状态
offset O int 分页offset
limit O int 分页limit
新增参数：
salemenu_id O string 销售单号
响应：
code M int 返回码，0表示成功，其他表示错误
msg M string 错误信息
data M dict 商户的销售单信息
示例：
request
/station/order/order_sku_list?start_date=2017-11-03&end_date=2017-11-06&search_text=&salemenu_id=S0520
&query_type=1&status=undelivery&offset=0&limit=20
response
{
"data": {
"list": [
{
"std_sale_price": "20.82",
"salemenu_id": "S0520",
"outer_id": "",
"resname": "巴蜀豆花饭庄",
"salemenu_name": "深圳餐厅售卖单",
"id": "D1340083",
"order_id": "PL637311",
"sale_ratio": 1,
"name": "鸡粉|凤球唛鸡粉|1kg",
"std_unit_name": "罐",
"sale_unit_name": "罐",
"is_price_timing": false,
"status": 1,
"address_id": "S08098"
},
{
"std_sale_price": "6.60",
"salemenu_id": "S0520",
"outer_id": "",
"resname": "巴蜀豆花饭庄",
"salemenu_name": "深圳餐厅售卖单",
"id": "D1079936",
"order_id": "PL637312",
"sale_ratio": 1,
"name": "白菜苔|斤",
"std_unit_name": "斤",
"sale_unit_name": "斤",
"is_price_timing": false,
"status": 1,
"address_id": "S08098"
},
{
"std_sale_price": "135.68",
"salemenu_id": "S0520",
"outer_id": "",
"resname": "巴蜀豆花饭庄",
"salemenu_name": "深圳餐厅售卖单",
"id": "D1099340",
"order_id": "PL637312",
"sale_ratio": 1,
"name": "稻中稻香油粘米|50斤",
"std_unit_name": "包",
"sale_unit_name": "包",
"is_price_timing": false,
"status": 1,
"address_id": "S08098"
}
],
"pagination": {
"offset": 0,
"count": 3,
"limit": 20
}
},
"code": 0,
"msg": "ok"
}
以下是有变化的接口
station
修改
/views/order/TransportOrdersQueryView orders 拉取订单列表
/views/order/OrderEditView 增加订单详情页返回字段
/views/order/OrderCreateView 合单
/views/order_sku/OrderSkuListView 拉取sku列表
/views/daily_sales/DailySalesOrderDetailView 新的生成Excel表逻辑与格式
/dals/order_sku/get_ordered_sku 新增过滤方式，合并搜索方法
新增
/views/area/GetAreaDict 获取站点可配送范围
/dals/order_sku/get_cycle_time 按查找周期时间来获得查询时间范围（copy自views/order/TransportOrdersQueryView,实际为静态方法,未提出）
/dals/refund/get_refund_num_by_sku_id 根据sku_id查询退货数
common
新增
/mysql/area/get_district_area_dict 获取城市下的所有区，街道信息字典
/mysql/area/get_area_list 获取区下的所有街道id列表
bshop
修改
/order/confirm 下单时获得合单信息 修改其调用的format_simple_order方法
website/order/dals/order/format_simple_order 添加了返回订单的创建时间''data_time'字段