Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2024-10-29 16:22:08 +08:00

View File

@@ -256,8 +256,8 @@ public class FeieyunPrintUtil {
data.append(StrUtil.format("<B>应收:{}</B><BR>", t)); data.append(StrUtil.format("<B>应收:{}</B><BR>", t));
} }
if (ObjectUtil.isNotEmpty(detailPO.getPayType()) && ObjectUtil.isNotNull(detailPO.getPayType()) && detailPO.getPayType().equals("deposit")) { if (ObjectUtil.isNotEmpty(detailPO.getPayType()) && ObjectUtil.isNotNull(detailPO.getPayType()) && detailPO.getPayType().equals("deposit")) {
data.append("--------------------------------<BR>");
data.append(StrUtil.format("储值:{}<BR>", detailPO.getReceiptsAmount())); data.append(StrUtil.format("储值:{}<BR>", detailPO.getReceiptsAmount()));
data.append("--------------------------------<BR>");
data.append(StrUtil.format("积分:{}<BR>", detailPO.getIntegral())); data.append(StrUtil.format("积分:{}<BR>", detailPO.getIntegral()));
} }
data.append(StrUtil.format("余额:{}<BR>", detailPO.getBalance())); data.append(StrUtil.format("余额:{}<BR>", detailPO.getBalance()));