增加fund_code，多资金方可用

每日赔付/去哪儿每日赔付/去哪儿每日赔付.py

@@ -43,7 +43,7 @@ select product_no from qunaer_new.fund_repay_detail where type  IN (5,7)
 
 
 sql_repay='''
-select repay.product_no,current_stage_no,date(repay_time) repay_time,repay_principle,repay_fee_amount,repay_due_amount
+select repay.product_no,pay.fund_code,current_stage_no,date(repay_time) repay_time,repay_principle,repay_fee_amount,repay_due_amount
 from qunaer_new.repay_detail  repay
 JOIN qunaer_new.pay_detail pay on repay.product_no = pay.product_no and pay.status = 1
 where repay.fund_code !=1
@@ -81,6 +81,7 @@ def qunaer_peifu(start_time,end_time):
 
 	df_fund_plan['product_no'] = df_fund_plan['product_no'].astype(str)
 	df_repay['product_no'] = df_repay['product_no'].astype(str)
+
 	df_repay=pd.merge(df_repay,df_fund_plan[['product_no', 'current_stage_no', 'deadline']],how='left')
 	df_repay.loc[df_repay.repay_time >=end_time,'repay_principle'] = 0
 	df_repay.loc[df_repay.repay_time >= end_time, 'repay_fee_amount'] = 0
@@ -117,8 +118,10 @@ def qunaer_peifu(start_time,end_time):
 	df_result_pay['zc'] = df_result_pay.loc[df_result_pay['repay_time'] == df_result_pay['deadline'],'repay_principle']
 	df_result_pay['yq'] = df_result_pay.loc[df_result_pay['repay_time'] > df_result_pay['deadline'],'repay_principle']
 
-	df_result_sum = pd.merge(df_result_benjin,df_result_pay.groupby('deadline')['tq','zc','yq'].sum().reset_index(),on='deadline',how='left')
-	df_result_sum.loc[df_result_sum.fund_code == 2,'fund_code'] = u'笑脸'
+	df_result_sum = pd.merge(df_result_benjin,df_result_pay.groupby(['deadline','fund_code'])['tq','zc','yq'].sum().reset_index(),on=['deadline','fund_code'],how='left')
+
+	df_result_sum.loc[df_result_sum.fund_code == 2,'fund_code'] = u'惠金所'
+	df_result_sum.loc[df_result_sum.fund_code == 3, 'fund_code'] = u'笑脸'
 	df_result_sum.rename(columns = {'deadline':u'自然日','fund_code':u'资金方','principle':u'应还本金','fee_amount':u'应还利息','tq':u'提前还款可用','zc':u'正常还款','yq':u'逾期还款'},inplace=True)
 	df_result_sum.fillna(0,inplace=True)