Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 21:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、软件购买金额字段赋值问题修复；2、手工调账单个金额提交异常问题修复；3、可开票金额获取来源错误修复；

Browse Source
This commit is contained in:
gaoqr
2025-10-20 12:09:53 +08:00
parent 438784c115
commit be88f91e89
7 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml
+8 -6
View File
@@ -15,7 +15,7 @@
AND i.business_no = #{reqVO.businessNo}
</if>
<if test="reqVO.orderNo != null and reqVO.orderNo != ''">
AND i.order_no = #{reqVO.orderNo}
AND (i.order_no = #{reqVO.orderNo} or i.purchase_id = #{reqVO.orderNo})
</if>
<if test="reqVO.tradeType != null">
<choose>
@@ -33,17 +33,19 @@
<if test="reqVO.incomeExpenseType != null">
AND i.income_expense_type = #{reqVO.incomeExpenseType}
</if>
<if test="reqVO.createTime != null and reqVO.createTime.size() == 2">
AND i.create_time between #{reqVo.createTime[0]} and #{reqVo.createTime[1]}
<if test="reqVO.createTime != null and reqVO.createTime.length == 2">
AND i.create_time between #{reqVO.createTime[0]} and #{reqVO.createTime[1]}
</if>
<if test="reqVO.productPrice != null">
AND p.total_amount = #{reqVo.productPrice}
AND p.total_amount = #{reqVO.productPrice}
</if>
<if test="reqVO.rechargeAmount != null">
AND i.cash_amount_change = #{reqVo.rechargeAmount}
AND i.cash_amount_change = #{reqVO.rechargeAmount}
AND (i.trade_type = '${@com.cf.imes.module.system.enums.pay.TradeTypeEnum@RECHARGE.code}' or i.trade_type = '${@com.cf.imes.module.system.enums.pay.TradeTypeEnum@MANUAL_ADJUST.code}')
</if>
<if test="reqVO.giftAmount != null">
AND i.gift_amount_change = #{reqVo.giftAmount}
AND i.gift_amount_change = #{reqVO.giftAmount}
AND (i.trade_type = '${@com.cf.imes.module.system.enums.pay.TradeTypeEnum@RECHARGE.code}' or i.trade_type = '${@com.cf.imes.module.system.enums.pay.TradeTypeEnum@MANUAL_ADJUST.code}')
</if>
</select>
</mapper>
cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml
+4 -4
View File
@@ -18,7 +18,7 @@
SUM(
CASE
WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}'
THEN CASE WHEN initial = TRUE THEN total_amount ELSE account_balance_spent END
THEN account_balance_spent + external_spent
ELSE 0
END
) AS invocable,
@@ -26,7 +26,7 @@
SUM(
CASE
WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@PENDINGINVOICING.code}'
THEN CASE WHEN initial = TRUE THEN total_amount ELSE account_balance_spent END
THEN account_balance_spent + external_spent
ELSE 0
END
) AS inTheInvoice,
@@ -34,7 +34,7 @@
SUM(
CASE
WHEN is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICINGSUCCESSFUL.code}'
THEN CASE WHEN initial = TRUE THEN total_amount ELSE account_balance_spent END
THEN account_balance_spent + external_spent
ELSE 0
END
) AS invoiced
@@ -43,7 +43,7 @@
</select>
<select id="getInvoicableAmount" resultType="java.math.BigDecimal">
select sum(total_amount - gift_money_spent) from purchase_record
select sum(account_balance_spent + external_spent) from purchase_record
where organ_id = #{organId} and is_invocing = '${@com.cf.imes.module.system.enums.pay.InvoiceStatusEnum@INVOICABLE.code}'
and id in
<foreach collection="ids" item="id" open="(" close=")" separator=",">