diff --git a/b/promoting/getpromoting.dspy b/b/promoting/getpromoting.dspy index 2db44e8..6b942f6 100644 --- a/b/promoting/getpromoting.dspy +++ b/b/promoting/getpromoting.dspy @@ -2,32 +2,33 @@ async def getpromoting(ns): """促销展示""" db = DBPools() async with db.sqlorContext('kboss') as sor: - if ns: + # if ns: # 生成邀请码展示促销活动 - users_id = await get_user() - if ns.get('type'): - ns['sort'] = 'create_at desc' + users_id = await get_user() + if ns.get('type'): + ns['sort'] = 'create_at desc' - orgid = await sor.R('users', {'id': users_id}) - ns['orgid'] = orgid[0]['orgid'] - # reacs = await sor.R('promoting', ns) - dates = datetime.datetime.now() - promoting = """select * from promoting where del_flg = 0 and orgid = ${orgid}$ and end_date > ${dates}$ order by create_at desc""" - reacs = await sor.sqlExe(promoting, {'orgid': ns['orgid'],'dates':dates}) - date = await get_business_date(sor=None) - listdata = [] - for i in reacs: - if i['end_date'] > date: - listdata.append(i) - return {'status': True, 'data': listdata} - else: - ns['del_flg'] = '0' - ns['sort'] = 'create_at desc' - orgid = await sor.R('users', {'id': users_id}) - ns['orgid'] = orgid[0]['orgid'] - reacs = await sor.R('promoting', ns) - return {'status': True, 'data': reacs} - return {'status': False, 'msg': '参数不正确'} + orgid = await sor.R('users', {'id': users_id}) + ns['orgid'] = orgid[0]['orgid'] + # reacs = await sor.R('promoting', ns) + dates = datetime.datetime.now() + promoting = """select * from promoting where del_flg = 0 and orgid = ${orgid}$ and end_date > ${dates}$ order by create_at desc""" + reacs = await sor.sqlExe(promoting, {'orgid': ns['orgid'],'dates':dates}) + date = await get_business_date(sor=None) + listdata = [] + for i in reacs: + if i['end_date'] > date: + listdata.append(i) + return {'status': True, 'data': listdata} + else: + ns['del_flg'] = '0' + ns['sort'] = 'create_at desc' + orgid = await sor.R('users', {'id': users_id}) + ns['orgid'] = orgid[0]['orgid'] + reacs = await sor.R('promoting', ns) + return {'status': True, 'data': reacs} + + # return {'status': False, 'msg': '参数不正确'} ret = await getpromoting(params_kw) return ret \ No newline at end of file