diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayProductChannelCodeEnumNew.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayProductChannelCodeEnumNew.java index 3ed55d9a5..24e77b344 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayProductChannelCodeEnumNew.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayProductChannelCodeEnumNew.java @@ -1,5 +1,7 @@ package com.cf.imes.module.system.enums.pay; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import lombok.Getter; import java.util.ArrayList; @@ -120,8 +122,15 @@ public enum PayProductChannelCodeEnumNew { * * @param code */ - public static String describe(int code) { - return parse(code).stream() + public static String describe(Integer code) { + if (ObjectUtil.isNull(code)) { + return null; + } + List parse = parse(code); + if (CollUtil.isEmpty(parse)) { + return null; + } + return parse.stream() .map(PayProductChannelCodeEnumNew::getLabel) .collect(Collectors.joining("+")); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java index ab2d57fa3..7b283dff4 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java @@ -79,7 +79,7 @@ public class IncomeExpenseServiceImpl implements IncomeExpenseService { if (TradeTypeEnum.RECHARGE.getCode().equals(tradeType)) { respVO.setRechargeAmount(i.getCashAmountChange()); respVO.setRechargeGiftAmount(i.getGiftAmountChange()); - respVO.setPaymentMethod(i.getChannelCode().getDesc()); + respVO.setPaymentMethod(ObjectUtil.isNotNull(i.getChannelCode()) ? i.getChannelCode().getDesc() : null); respVO.setOrderNo(i.getOrderNo()); } else if (TradeTypeEnum.PRODUCT.getCode().equals(tradeType)) { diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml index 3f54f345b..37d10589a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml @@ -12,7 +12,7 @@ AND i.organ_id = #{reqVO.organId} - AND i.business_no = #{reqVO.businessNo} + AND i.business_no like concat('%', #{reqVO.businessNo}, '%') AND (i.order_no = #{reqVO.orderNo} or i.purchase_id = #{reqVO.orderNo}) @@ -47,5 +47,8 @@ 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}') + + AND i.creator like concat('%', #{reqVO.operator}, '%') + \ No newline at end of file