Subversion Repositories SmartDukaan

Rev

Rev 852 | Rev 860 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 852 Rev 855
Line 7... Line 7...
7 
    Alerts, Order
 7 
    Alerts, Order
8 
from shop2020.thriftpy.model.v1.order.ttypes import Transaction as T_Transaction,\
 8 
from shop2020.thriftpy.model.v1.order.ttypes import Transaction as T_Transaction,\
9 
    TransactionServiceException, TransactionStatus, OrderStatus
 9 
    TransactionServiceException, TransactionStatus, OrderStatus
10 
import datetime
 10 
import datetime
11 
from elixir import *
 11 
from elixir import *
12 
from shop2020.utils.Utils import to_py_date
 12 
from shop2020.utils.Utils import to_py_date, to_java_date
13 
from sqlalchemy.sql.expression import and_
 13 
from sqlalchemy.sql.expression import and_
14 
from shop2020.model.v1 import order
 14 
from shop2020.model.v1 import order
15 
from shop2020.clients.LogisticsClient import LogisticsClient
 15 
from shop2020.clients.LogisticsClient import LogisticsClient
16 
 
 16 
 
17 
def get_new_transaction():
 17 
def get_new_transaction():
Line 136... Line 136...
136
136
137 
            order.warehouse_id = logistics_info.warehouseId
 137 
            order.warehouse_id = logistics_info.warehouseId
138 
            order.logistics_provider_id = logistics_info.providerId
 138 
            order.logistics_provider_id = logistics_info.providerId
139 
            order.airwaybill_no = logistics_info.airway_billno
 139 
            order.airwaybill_no = logistics_info.airway_billno
140 
            order.tracking_id = order.airwaybill_no
 140 
            order.tracking_id = order.airwaybill_no
141 
            order.expected_delivery_time = datetime.datetime.now() + 24*60*60*1000*logistics_info.deliveryTime
 141 
            order.expected_delivery_time = datetime.datetime.now() + datetime.timedelta(days=logistics_info.deliveryTime)
142
- 
 
143 
    session.commit()
 142 
    session.commit()
144 
    return True
 143 
    return True
145 
 
 144 
 
146 
 
 145 
 
147 
def get_order(order_id):
 146 
def get_order(order_id):