yumoqing/kboss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'update' (#48) from main into prod

Browse Source 
Reviewed-on: #48
This commit is contained in:
charles 2025-11-21 18:23:18 +08:00
commit 7e4f4003b3
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
b/baiduc/baidu_confirm_refund_order.dspy
View File

@ -72,15 +72,20 @@ async def affirmbz_order(ns={}):
resource_find_sql = """select id, resourceid, expire_resourceid from customer_goods where FIND_IN_SET('%s', resourceid) and del_flg = '0';""" % j['resourceids'] resource_find_sql = """select id, resourceid, expire_resourceid from customer_goods where FIND_IN_SET('%s', resourceid) and del_flg = '0';""" % j['resourceids']
resource_find_li = await sor.sqlExe(resource_find_sql, {}) resource_find_li = await sor.sqlExe(resource_find_sql, {})
resource_find_id = resource_find_li[0]['id'] resource_find_id = resource_find_li[0]['id']
expire_resourceid = resource_find_li[0]['expire_resourceid'] expire_resourceid = resource_find_li[0]['expire_resourceid']
expire_resourceid += expire_resourceid + ',' + j['resourceids'] if expire_resourceid else j['resourceids'] if expire_resourceid:
new_expire_resourceid = expire_resourceid + ',' + j['resourceids']
else:
new_expire_resourceid = j['resourceids']
items_refund = resource_find_li[0]['resourceid'].split(',') if resource_find_li[0]['resourceid'] else [] items_refund = resource_find_li[0]['resourceid'].split(',') if resource_find_li[0]['resourceid'] else []
filtered_items = [item for item in items_refund if item != j['resourceids']] filtered_items = [item for item in items_refund if item != j['resourceids']]
result = ','.join(filtered_items) result = ','.join(filtered_items)
if not result: if not result:
await sor.U('customer_goods', {'id': resource_find_id, 'del_flg': '1'}) await sor.U('customer_goods', {'id': resource_find_id, 'del_flg': '1'})
else: else:
await sor.U('customer_goods', {'id': resource_find_id, 'resourceid': result, 'expire_resourceid': expire_resourceid}) await sor.U('customer_goods', {'id': resource_find_id, 'resourceid': result, 'expire_resourceid': new_expire_resourceid})
# 处理续费逻辑 # 处理续费逻辑
elif order_type == 'RENEW': elif order_type == 'RENEW':
@ -118,7 +123,11 @@ async def affirmbz_order(ns={}):
return {'status': True, 'msg': '支付成功'} return {'status': True, 'msg': '支付成功'}
except Exception as error: except Exception as error:
await sor.rollback() await sor.rollback()
return {'status': False, 'msg': str(error)} import traceback
with open('baiducloud_err.txt', 'w') as f:
f.write(str(error) + str(traceback.format_exc()))
traceback.print_exc()
return {'status': False, 'msg': str(error) + str(traceback.format_exc())}
async def baidu_new_update_resouce(ns={}): async def baidu_new_update_resouce(ns={}):
@ -514,7 +523,8 @@ async def get_baidu_orderlist(ns={}):
await user_action_record(ns_record) await user_action_record(ns_record)
return { return {
'status': False, 'status': False,
'msg': '支付错误, 请联系售后' 'msg': '支付错误, 请联系售后,',
'data': affirmbz_order_res
} }
# 预配置local_refund用于本地操作 # 预配置local_refund用于本地操作
@ -737,8 +747,8 @@ async def update_baidu_order_list(ns={}):
async def baidu_confirm_refund_order(ns={}): async def baidu_confirm_refund_order(ns={}):
# ns = { # ns = {
# 'order_id': ["13f3518648054796abf7f3d00ed611bf"], # 'order_id': ["2996f0baf34c4a0a98e1da0b4e290a35"],
# 'userid': 'KsKhCUPizQyGiw3L1WVRy' # 'userid': 'y_xQK0G62dtZT5EneMQFT'
# } # }
import asyncio import asyncio
# 把 NEED_CONFIRM的订单同步到本地库，用于后续状态更新 # 把 NEED_CONFIRM的订单同步到本地库，用于后续状态更新