Explorar o código

付款管理-支付

ZhangWenQiang %!s(int64=5) %!d(string=hai) anos
pai
achega
ea4cc37f56

+ 6 - 0
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/entity/HlwPayment.java

@@ -213,4 +213,10 @@ public class HlwPayment implements Serializable {
     @TableField(exist = false)
     @Dict(dicCode = "payment_type")
     private java.lang.Integer paymentType;
+
+    /**
+     * 企业账户余额
+     */
+    @TableField(exist = false)
+    private Double accountBalance;
 }

+ 4 - 1
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/mapper/xml/HlwPaymentMapper.xml

@@ -29,11 +29,14 @@
 		com.company_name AS "companyName",
 		case when a.is_through_platform =1 and a.status !=3 then null else sub.name end AS "subcontractorName",
 		app.application_name AS "applicationName",
-		pd.payment_type AS "paymentType"
+		pd.payment_type AS "paymentType",
+		case when a.is_through_platform =1 then acc.balance else ac.balance end AS "accountBalance"
 	</sql>
 
     <sql id="hlwPaymentJoins">
 		LEFT JOIN hlw_company com ON com.id = a.company_id
+		LEFT JOIN hlw_company_account ac ON ac.application_id = a.application_id and ac.company_id = a.company_id and ac.subcontractor_id = a.subcontractor_id
+		LEFT JOIN hlw_company_account acc ON acc.application_id = a.application_id and acc.company_id = a.company_id and acc.cp_id is not null
 		LEFT JOIN hlw_subcontractor sub ON sub.id = a.subcontractor_id
 		LEFT JOIN hlw_application_setting app ON app.id = a.application_id
 		LEFT JOIN hlw_payment_detail pd ON pd.payment_id = a.id