[商户解单][修改][汇总]

mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

@@ -114,8 +114,8 @@
 	</resultMap>
 
 	<sql id="allColumnsVo">
-	    mtd.id as id, mtd.b_user_id as b_user_id, mtd.trade_amt, mtd.report_date, mtd.trade_count, mtd.proof,
-	    mtd.create_date as create_date, mtd.update_date as update_date,
+	    mtd.id as id, mtd.b_user_id as b_user_id, ifnull(mtd.trade_amt,0) as trade_amt, mtd.report_date,
+	    ifnull(mtd.trade_count,0) as trade_count, mtd.proof,mtd.create_date as create_date, mtd.update_date as update_date,
 	    m.tenant_id as tenant_id, m.id as merchant_id, m.name as merchant_name, m.business_id, m.sub_business_id,
 	    mbu.name as b_user_name, mbu.phone as b_user_phone
 	</sql>