diff --git a/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java b/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java index 13e996d..7507491 100644 --- a/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java +++ b/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java @@ -22,6 +22,6 @@ public interface MatrixAdvRecordMapper extends BaseMapper { @Select("select device_id from matrix_white_device") List whiteList(); - @Select("select device_id, device_brand, device_name, ip from matrix_adv_record where device_id in (select device_id from matrix_white_device where channel = #{channel}) group by device_id") + @Select("select device_id, device_brand, device_name, ip from matrix_adv_record where device_id in (select device_id from matrix_white_device where channel = #{channel}) limit 200") List getWhiteDevice(String channel); } diff --git a/game-service/src/main/java/awesome/group/game/service/pay/AlipayFundTransUniTransfer.java b/game-service/src/main/java/awesome/group/game/service/pay/AlipayFundTransUniTransfer.java index 57929c6..dfb7589 100644 --- a/game-service/src/main/java/awesome/group/game/service/pay/AlipayFundTransUniTransfer.java +++ b/game-service/src/main/java/awesome/group/game/service/pay/AlipayFundTransUniTransfer.java @@ -92,7 +92,7 @@ public class AlipayFundTransUniTransfer { record.setReason(reason); return false; } - } catch (AlipayApiException e) { + } catch (Exception e) { L.trace("transferError", "record:" + gson.toJson(record), e); record.setReason("转账失败"); record.setStatus(UserService.TRANSFER_FAIL);