Merge branch 'dm_20251204' into dev

# Conflicts:
#	mhd-user-center/src/main/resources/mapper/UserMapper.xml
#	mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
This commit is contained in:
王奎兴
2025-12-06 22:15:26 +08:00
63 changed files with 314 additions and 257 deletions
@@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<!--<update id="updateCreditLimit">
UPDATE `account_cash_wallet` SET `credit_limit` =
UPDATE account_cash_wallet SET credit_limit =
CASE
WHEN `credit_limit` - #{creditLimit} >= 0 THEN `credit_limit` - #{creditLimit}
WHEN credit_limit - #{creditLimit} >= 0 THEN credit_limit - #{creditLimit}
ELSE credit_limit
END
WHERE user_id = #{userId}
@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
COUNT( 1 ) waybillCount,
waybill_source_name
FROM
`business_document`
business_document
where del_flag = 1
<include refid="selectBusinessDocumentPo1"/>
GROUP BY
@@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
a.*
FROM
`business_document` a
business_document a
LEFT JOIN reconciliation_business_document c ON a.business_document_id = c.business_document_id
LEFT JOIN reconciliation d ON c.reconciliation_id = d.reconciliation_id
WHERE
@@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
a.*
FROM
`business_document_detali` a
business_document_detali a
LEFT JOIN reconciliation_business_document c ON a.business_document_id = c.business_document_id
LEFT JOIN reconciliation d ON c.reconciliation_id = d.reconciliation_id
WHERE
@@ -506,7 +506,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
image_url
FROM
`loan_image`
loan_image
WHERE
loan_id = #{values} and del_flag = 1
</select>