Merge branch 'main' of git.opencomputing.cn:yumoqing/kboss

b/baiducloud/get_baidu_orderlist.dspy

@@ -449,7 +449,7 @@ async def get_baidu_orderlist(ns={}):
                         # 获取余额
                         user_balance = await getCustomerBalance(sor, orgid[0]['id'])
                         # 判断余额是否大于50
-                        if user_balance < 5000000:
+                        if user_balance < 500:
                             await sor.rollback()
                             paydata = {'queryAccountId': baidu_users[0]['baidu_id'], 'orderIds': [ns.get('order_id')]}
                             ns_format = '&'.join(['%s=%s' % (k, v) for k, v in ns.items()])

b/news/front_news_search.dspy

@@ -34,10 +34,7 @@ async def front_news_search(ns={}):
                     publish_time_zh, publish_time_en, read_count
                 from enterprise_news_article
                 where %s
-                order by greatest(
-                    ifnull(publish_time_zh, '1000-01-01'),
-                    ifnull(publish_time_en, '1000-01-01')
-                ) desc, update_time desc
+                order by publish_time_zh desc, update_time desc
                 limit %s offset %s;
             """ % (where_clause, page_size, offset)
             result = await sor.sqlExe(search_sql, {})

b/news/news_article_search.dspy

@@ -88,7 +88,7 @@ async def news_article_search(ns={}):
                 'status': True,
                 'msg': 'search news article success',
                 'data': result,
-                'article_type_summary_zh': article_type_summary_zh,
+                'article_type_summary': article_type_summary_zh,
                 'article_type_summary_en': article_type_summary_en,
                 'pagination': {
                     'total': total_count,