Compare commits

..

No commits in common. "f12486677e1377561c35813891cf506802aeface" and "63b50aa77dc3fd23bc479f3583c9965eb9c96cb2" have entirely different histories.

View File

@ -51,9 +51,9 @@ async def affirmbz_order(ns={}):
count = await getCustomerBalance(sor, orgid[0]['customerid']) count = await getCustomerBalance(sor, orgid[0]['customerid'])
if count == None: if count == None:
count = 0 count = 0
#if count - float(orgid[0]['amount']) < 0: if count - float(orgid[0]['amount']) < 0:
#pricedifference = count - round(orgid[0]['amount'],2) pricedifference = count - round(orgid[0]['amount'],2)
#return {'status': False, 'msg': '账户余额不足, count: %s' % str(count),'pricedifference': round(pricedifference,2)} return {'status': False, 'msg': '账户余额不足','pricedifference': round(pricedifference,2)}
await order2bill(ns['orderid'], sor) await order2bill(ns['orderid'], sor)
bills = await sor.R('bill', {'orderid': ns['orderid'], 'del_flg': '0'}) bills = await sor.R('bill', {'orderid': ns['orderid'], 'del_flg': '0'})
try: try:
@ -902,17 +902,15 @@ async def baidu_confirm_refund_order(ns={}):
await sor.U('user_action', {'id': ns_record_id, 'ordertype': 'REFUND', 'reason': '远程退款成功, 本地客户退款成功'}) await sor.U('user_action', {'id': ns_record_id, 'ordertype': 'REFUND', 'reason': '远程退款成功, 本地客户退款成功'})
continue continue
else: else:
db = DBPools() ns_err_log = {
async with db.sqlorContext('kboss') as sor: 'id': uuid(),
ns_err_log = { 'log_level': 'ERROR',
'id': uuid(), 'log_content': '远程退款成功,本地退款失败 %s' % str(local_refund_status),
'log_level': 'ERROR', 'user_id': ns.get('userid'),
'log_content': '远程退款成功,本地退款失败 %s' % str(local_refund_status), 'request_url': '/baiduc//baidu_confirm_refund_order.dspy',
'user_id': ns.get('userid'), 'request_params': json.dumps({'order_id': order_id, 'baidu_id': ns.get('baidu_id')}),
'request_url': '/baiduc//baidu_confirm_refund_order.dspy', }
'request_params': json.dumps({'order_id': order_id, 'baidu_id': ns.get('baidu_id')}), await sor.C('warn_error_log', ns_err_log)
}
await sor.C('warn_error_log', ns_err_log)
ns_record = { ns_record = {
'orderid': order_id, 'orderid': order_id,